Merged darrels changes. Added watchdog.