Second try on correcting issues from Homework 2.
This project contains things needed for Homework 3.