Fixes the double combine bug
Breaks the consolidate logic off to another object b/c it needed more logic