Uploading changes before class

Work in progress, should compile.

Lots of UI changes