Moved more to main control class