Closes #2
Closes #3