Closes #7
Closes #12