Flushed the GUI out a lot