Massive refactor; old chars no longer compatible