Map is still not getting passed around