Feature 18 separate watch install

For review