Some work on SpotLight (WIP)