Polish this off. Closes #35.