Closes #13. Still some work to be done.