Master commit

Lots of stuff. :3