Yeah the idea is to stick to the original 7 classes and fit characters into the class that makes the most sense. Another thing to note is I want to avoid guns just as the normal Fate has, as a character who uses guns doesn't really fit into the whole thing. This is specifically Servants of course, but if someone really, really wants to play a character that uses a gun, I guess that could be an Archer Class.

Something else to keep in mind is that Fate seems to use the Assassin Class as their general go to for characters that don't fit into other classes. Like in Stay Night, the 'Assassin' who probably should have been a Saber.