Consolidated TODOs and fixed some bugs

I expect that current set of 13 TODOs will likely carry over into the next milestone

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