Pushed a ton of stuff.

I spent some time on the GUI drawing...