Closes #9
Closes #10