My version of the UI refactor thus far. Stable-ish. Lots of classes missing. Resuming probably doesn't work all that well yet.