Initial work on abstracting stream fully into search