mapping->mutablemapping and more; WIP