Huge amount of stuff v1

I should really start commiting