lots of stuff

Committing all my code before merge.