I like this..  Can you add a unit test or two around these?