Flushed out more of the gui stuff, still needs work though