final commit pt1