Partial commit. #2 - 2/2.