Added a GUI and renamed things