Added basic server and client