Merge pull request #197 from steinernein/dev-sockets

Retrying again.
 WIP: Dealing with sync.