final commit for thursday, april 4th