Finishing up iteration 1 code