Even more mappings

Mostly everything is mapped