Add/map layer presenter tmp 8

**Not ready to merge**