Changed the ordering of the init again...

This is getting ridiculous