Initial commit of code for watchdogs
Cleaned up some of the watchdog code and dealt with data deleation