Refactoring map + static and dynamic lights - mid commit