Final homework 7 commit.