Final Commit

fixed all tests so they pass and removed temporary puts statements