Samurai should be implemented as the dps upgrade from the base class swordsman while the tank upgrade from swordsman is the shogun.