Added more classes, created mainwindow