Get watch/server working