Initial weapon now set based on starting class