Add Build watch support

I think this calls for a general work stoppage.