8 Commits (feature/socket)