Most of the way through Use Case 2, pushing to prevent predicted future merging problems