Please, please, please halt your changes in this area until you have had the chance to discuss your method of mapping via my other changeset comments and DM. I'm currently finding a very large number of errors which will take time to revert.