WIP: lookup once, not twice
WIP: 2/3 tests pass
WIP: All tests on isolated trajectories pass.