Move callback code into separate functions.
Add spotlight.