more work towards --watch