More work on adding daemon and command checks.