Add watch and dev server