Clean up and mark as in progress for part three