Adding homework 7 functionality
Merge pull request #10 from cwnidog/homework7

Adding homework 7 functionality