Major changes (first push)

I haven't been keeping this up to date, but I am now (for UI work), so
this description is pretty much "everything changes"