More Spotlight stuff

still not done