Whoops, forgot to include CharacterMenu in my last commit...