WATERSMART-284

This will need some more testing, but it seems the watch logic doesn't need to handle which state the application is in.