Moved Make/TakeOrder from model to controller
Removed reinstantiation of MainFrame