Initial upload of assignment 3