Watchdog prototype completed, need to change from signals to RPC, also cleanup code