Major overhaul to the daemon branch to try and make it more robust.  This has a high probablity of not working right the first time.