Basic work on assignment 2