Still making progress on assignment 1