More work on the map

Now attempts to get new data after moving.
Refactor LayerList to use the same list of layers