Big changes - added server connection and login