Added location overlays. Will start refactor now.