It is very nice that you isolated this. This makes it very easy to unit test it (which we should do)!