need better way to map-test
in progress but not in the mood :/