Closes #98
Closes 82