Merge and divide up to date

Functional with unit ids in place of unit objects