Wip 10192 objectstore tool lookup zafman

5 more commits I wrote today.