Watch now working very nicely.  Rebuilds and restarts on change.