Tentative final commit pt2