This is under refact in the user-stream-2 branch.