Feature/daemon

Time for final review