Transfer more stuff out the main class