Began adding PvP and CvC functionality