Whole bunch of progress

I suck at versioning