Closes #32
Closes #35
#31 closed, will have to revisit process