Current Progress

UI stuff needs a lot of cleaning up.