Finishing the assignment

This is the completed version of the assignment