Major changes

Lots of them. Really.