Started implementing the GUI
Merge branch 'GUI'