Minor changes to the order things are loaded.

TODO: Implement better broadcasts