Checkpoint from apollo

Save the current changes before starting to clean up.