[WIP] refactor huge ValueMappingX class

- ValuerMapper needs to access ValueMappingX members more consistantly