Assignment 2, need to fnish