Added server connection, mostly