Rework to go from Blocks to stream
compile errors
stream working
stream working