More code cleanup
Add metrics to secondary watcher
Why do people check in 380 char long lines??
A first stab at logging lifecycle events