Added parts for assignment 7