Added a lot of stuff, and I didn't keep a changelog