@@ -0,0 +47,4 @@
+		go ta.Listen()
+		go func() {
+			for {
+				ta.Replay()

@@ -0,0 +63,4 @@
+		data := ta.connection.Expect()
+		if len(data) == 0 {
+			log.Debugf("Server closed the connection...")
+			return // connection is closed

@@ -0,0 +101,4 @@
+	egm := groups.EncryptedGroupMessage{Ciphertext: ct, Signature: sig};
+	//token, err := ta.paymentHandler.NextToken(egm.ToBytes(), ta.connection.Hostname())
+	//if err == nil {
+	log.Debugf("POSTING A DAMN MESSAGE")

@@ -0,0 +4,4 @@
+
+const (
+	// KeyTypeOnion - a cwtch address
+	KeyTypeOnion = "onion" // bulletin board

@@ -0,0 +28,4 @@
+}
+
+// GetKey retrieves a key with a given type from the bundle
+func (kb *KeyBundle) GetKey(name string) (Key, error) {

@@ -206,1 +207,4 @@
 
+func (cp *cwtchPeer) AddServer(serverSpecification string) {
+	keyBundle := new(model.KeyBundle)
+	json.Unmarshal([]byte(serverSpecification), &keyBundle)

@@ -207,0 +216,4 @@
+		onion := string(onionKey)
+		decodedPub, _ := base32.StdEncoding.DecodeString(strings.ToUpper(onion))
+		ab := keyBundle.AttributeBundle()
+		ab["nick"] = onion

@@ -207,0 +219,4 @@
+		ab["nick"] = onion
+		pp := &model.PublicProfile{Name: onion, Ed25519PublicKey: decodedPub, Authorization: model.AuthUnknown, Onion: onion, Attributes: ab}
+
+		cp.Profile.AddContact(onion, pp)

@@ -247,0 +249,4 @@
+// peerWithTokenServer is the entry point for cwtchPeer - server relationships
+// needs to be run in a goroutine as will block on Open.
+func (e *engine) peerWithTokenServer(onion string, tokenServerOnion string, tokenServerY string) {
+	e.ignoreOnShutdown(e.serverConnecting)(onion)

@@ -0,0 +111,4 @@
+						return
+					}
+				}
+				ta.serverSyncedHandler(ta.connection.Hostname())

@@ -80,2 +79,4 @@
 }
 
+// IsServer returns true if the onion address is associated with a server.
+func (p *PublicProfile) IsServer(onion string) bool {

@@ -204,6 +205,43 @@ func (cp *cwtchPeer) AddContact(nick, onion string, authorization model.Authoriz
 	cp.eventBus.Publish(event.NewEventList(event.SetPeerAttribute, event.RemotePeer, onion, event.SaveHistoryKey, event.DeleteHistoryDefault))
 }
 

@@ -207,0 +216,4 @@
+		if cp.GetContact(onion) == nil {
+			decodedPub, _ := base32.StdEncoding.DecodeString(strings.ToUpper(onion))
+			ab := keyBundle.AttributeBundle()
+			ab["nick"] = onion

@@ -207,0 +237,4 @@
+			return nil
+		}
+		// Server Already Exists
+		return errors.New("a contact already exists with the given onion address")

@@ -0,0 +56,4 @@
+	ta.AuthApp.Init(connection)
+	if connection.HasCapability(applications.AuthCapability) {
+		ta.connection = connection
+		ta.connection.SetCapability(groups.CwtchServerSyncedCapability)

@@ -0,0 +87,4 @@
+				newMessages := ta.LegacyMessageStore.FetchMessages()
+				// Set sync and then send any new messages that might have happened while we were syncing
+				ta.connection.SetCapability(groups.CwtchServerSyncedCapability)
+				if len(newMessages) > len(messages) {