52ff5a7d5a
I thought this bit of code was in the other repo. So long as part 3 follows close behind this, there shouldn't be an issue