light update

More light work done. Integrated the watcher tech into the main of the
project. Almost done with that I believe, but I want know for sure until
the whole project is done.