Closes #6
Hopefully...