Assignment 4

Initial pass of assignment 4