Completed assignment, add more comments