Spotlight migration

Do not merge!

Just using this to record question I have.