Responded to Itay's code review comments

Added some new TODOs (total=19) and updated scaffolding to reflect reality as well.

Signed-off-by: David Noble <dnoble@splunk.com>