FinalV3

Extra credit changes