Started working on #9. Closes #15