work in progress added location to mapcells, need code fixing