Further conversions, move some stuff to the Character class