Closes #7
Closes #10