Brandon's Updates

Changed a few lines around to help it pass the first set of tests, not passing lab3grader, unfortunately.