V2

Sat on a plane, improved this with a bunch of stuff. Broke compability, so this is version 2.