Merge Stuff

I got it done, now merge this!