Lots of stuff

Closes #1