Enhanced Map

wip