Closes #36

Let's use this to discuss anything else needed before merging.