Two phase handoff - fixes 373

Fixes #373.

DO NOT MERGE UNTIL AFTER #46. Two-phased push without incremental push will result in copying all of the data twice.