separated base and filewatch and probably broke everything