Don't you think? I mean, the samurai isn't necessarily a knight or could ever be like one. And it's not really known for being faster than anything on horseback. Plus, having the swordsman upgrade to the samurai would make a lot of sense. Of course, you'd have to take away a unit movement from them. Plus, feudalism did start that order, not chivalry, which didn't exist in Japan really. What are others thoughts?