Character refactor really completed. I think