Assignment 3

Initial pass at assignment 3