2 implement lookup 2

Obviously, the unittests are only stubs at this point, but I have other responsibilities to handle tonight.  I'll flesh them out tomorrow.
Nit: Avoid else-after-return