Massive updates to new coding structure.