Working on pulling stream consolidation out in front WIP