Drastic overhaul

* Throwing out a bunch of stuff!
* Will save space