Merge then checkpoint work to date...