Branching to switch to stream-manager

Working pull request, open for discussion.