team 3 code review 4/9/14