Got new mapper working
WIP: Replace old volume mapper with the new one for testing