Finish Assignment 7