Last (I hope) edit

Closes #5