Mass cleanup and probably final commit.

Calum will position and set up the models, then that should be us!