Add Build watch support

What's happening to the context?