Watchdog initial commit, modified the core of the server