Minor changes to Shooter class and addition of Driver class