more mapping wip