crap commit for merging
Merged and stuff