Closes #70
Closes #63