Closed will-maclean closed 2 weeks ago
For #24. Will also do #7 and #31 in this pull request
Closes #24 and closes #31. #7 is too difficult for now
For #24. Will also do #7 and #31 in this pull request