watchdog framework conversion WIP...