map code gitified, still needs integration