* Fixed some architectural oopsies.

* Fixing the last few problems caused by the merge and hopefully synching everything.