Added working Gui! and cleaned up some classes