Add Build watch support

I'm not sure what you're referring to here. This is following the exact same pattern used for all the other watch implementations we have. Clarify?