Context switching attempt

Committing what I have so far.
fixed mainwindow conflict
Ok, now the conflict is solved