Moved socketListen function into daemon file
Merge branch 'testing'