Moved more stuff over to characters.