FInish assignment 1