Brandon 4/10

Brandon and Chris's code properly merged