(PDB-709) More work

Signed-off-by: Ken Barber <ken@bob.sh>