update - still wip, map got blown up :/