I think this is all we need to do...

Closes #58