Closes #38 - done for now
Closes #37 - done for now