Moved classes around.  Added combos function to stream
Added extra changes to sync versions