This might be a good starting point for another PR related to the above TODO.

https://github.com/tstmedia/typhoid/pull/13/files#L1R19