Esper, Medic, Warrior, Spellslinger refactored to use a single form... more to come tomorrow