Fixes #9

A good example of a refactor to solve a new use case