Closed rjhd2 closed 2 weeks ago
Closes #151
Some refactoring but tests pass and are clear to what they should find. Merging
Closes #151