Added CDQ stuff, removed main_controller, added home_screen. Misc.