Adding in the main control class