Closes #69

This takes care of the items in 69. The rest of that ticket should be
moved to a new issue.