About to do a major refactor of the streaming algo