Still working on the GUI