rejigged this file so we could reuse some functions
rejigged this file so we could reuse some functions


Former-commit-id: 4b82b9fb542a99c7e83507d02be154b03de238ee
Former-commit-id: 78263e2b9c42cc48f9024dd1ca7c0c493ade3f58 [formerly c511557bf53c4a7dfd85cf07e7425dbede544eeb]
Former-commit-id: 39b3663c54423003ec7aa6e2b00535f1c5f871bd
interrogator/corpkit,interrogator/corpkit