I'll get some unit tests added in addition to getting a couple of end-to-end scenarios