Trying to extract out map creation, some weirdness with the objects going on.