Started smoothing out streaming
Fixed merge conflicts