Merge pull request #1 from JJKB599/master

Merging Jeff's changes to Brennan's fork.
Spotlight implemented
Merge pull request #3 from BrennanJones/master

Spotlight implemented