Separate watch and build commands

I was confused why the "build" command wasn't finishing :)