Checkpoint to actually submit previous cl. Dammit!
WIP lookup through subject origin.
WIP debugging the new lookup mechanism.
Changed lookup to include the subject's origin.
Self-review