Seems to work

Closes #15