Moving methods out of main window controller to where they should be