Added the mainwindow to the mix