Closes #3
Closes #1 and other stuff