Adding a GUI and some other bits