Do we want unit tests for this? <github.com/voxpup...