Temp fixes
Fixed map implementation
Old commit I forgot