Started on new State based gui
Lots and Lots of Gui Changes