This should be a PR which precedes merging #5 and #6 as their tests will depend on these changes.
This should be a PR which precedes merging #5 and #6 as their tests will depend on these changes.