Cleanup.  Moved stuff to Manager. Gameloop working.  TODOs added to relevant files.