Layers, some cleanup
Fog of war