integrating workout (slowly) part 1
merging