Continued work on assignment 1