Work on Gui and States