Allow for multiple mappings per OG: intitial work.