Reworked the character classes