More work on addWatch.  Still error on loop parameters.  And bug with using auto days.