Fixing Current, Starting work on the Watcher