CDB-4006 streaming working, pending some code cleanup