Assignment 2

Assignment 2 completed in this commit.