wip: mapper work. tests pass.