streaming works -- needs cleaup
some cleanup code -- still works
more cleanup -- streaming still works