simplify
WIP: make building mapping reusable, use in Documentation