Another milestone for #18. Almost did it!
Closes #18