Finishing assignment 1