Finished rework of character class