Stuff. More stuff.

Closes #97. Closes #114.