Maybe 70% done with all mappings