Started on getting the daemon back in there