Modified *MainWindow only uses new class based commands now*