Added almost complete connection, server logic remains