Itteration1

Finished fixing up code for itteration 1