Some more work. Start on Daemon.