Revert "Revert "Final submitted version for due date #2""

This reverts commit 606a244797ac6cd504a686f482c207b29ef2ad35.