Not yet finished reformatting of Character