Add Build watch support

Now I see, and agree, but can we address this issue generally.uniformly in another PR? I don't think it's worth stonewalling this piece of functionality since it's at least internally consistent.