Work in progress, servers are listening
Fixed client stuff to connect to server
Merge branch 'develop' into feature/clean
Merge branch 'feature/clean' into develop