Ran in to a little snag w/ the second unit test, but, updated w/ something that I think get's close to what you're asking for... mind taking a look and letting me know?