18 changed files with 381 additions and 1421 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,137 +0,0 @@
---
-kind: pipeline
-type: docker
-name: default
-
-steps:
-  - name: fetch
-    image: golang
-    volumes:
-      - name: deps
-        path: /go
-    commands:
-      - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/tor/tor
-      - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/tor/torrc
-      - chmod a+x tor
-      - go get -u golang.org/x/lint/golint
-      - git fetch --tags
-      #- export GO111MODULE=on
-      #- go mod vendor
-      - go get
-      # TODO: upgrade to go1.16, remove mod/vendor, add go install for 1.16
-      - echo `git describe --tags` > VERSION
-      - echo `date +%G-%m-%d-%H-%M` > BUILDDATE
-
-  - name: quality
-    image: golang
-    volumes:
-      - name: deps
-        path: /go
-    commands:
-      - go list ./... | xargs go vet
-      - go list ./... | xargs golint 
-        #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting
-
-  - name: build-linux
-    image: golang
-    volumes:
-      - name: deps
-        path: /go
-    commands:
-      - make linux
-
-  - name: build-android
-    image: openpriv/android-go-mobile:2021.03
-    volumes:
-      - name: deps
-        path: /go
-    commands:
-      - go mod download
-      - gomobile init
-      - make android
-
-  - name: build-windows
-    image: openpriv/mingw-go:2021.03
-    environment:
-      GOPATH: /go
-    volumes:
-      - name: deps
-        path: /go
-    commands:
-      - make windows
-
-  - name: deploy-buildfiles
-    image: kroniak/ssh-client
-    environment:
-      BUILDFILES_KEY:
-        from_secret: buildfiles_key
-    secrets: [gogs_account_token]
-    when:
-      event:
-        - push
-        - tag
-      status: [ success ]
-    commands:
-     - echo $BUILDFILES_KEY > ~/id_rsab64
-     - base64 -d ~/id_rsab64 > ~/id_rsa
-     - chmod 400 ~/id_rsa
-     - export DIR=libCwtch-go-`cat VERSION`-`cat BUILDDATE`
-     - mkdir $DIR
-     - mv libCwtch.so libCwtch.dll cwtch.aar cwtch-sources.jar libCwtch.h  $DIR/
-     - cd $DIR
-     - find . -type f -exec sha256sum {} \; > ./../sha256s.txt
-     - mv ./../sha256s.txt .
-     - cd ..
-     - scp -r -o StrictHostKeyChecking=no -i ~/id_rsa $DIR buildfiles@openprivacy.ca:/home/buildfiles/buildfiles/
-
-  - name: gitea-release
-    image: plugins/gitea-release
-    when:
-      event: tag
-    settings:
-      api_key:
-        from_secret: gogs_account_token
-      base_url: https://git.openprivacy.ca
-      files:
-        - libCwtch.so
-        - libCwtch.dll
-        - cwtch.aar
-        - cwtch-sources.jar
-        - libCwtch.h
-      checksum:
-        - sha256
-        - sha512
-
-  - name: notify-email
-    image: drillster/drone-email
-    settings:
-      host: build.openprivacy.ca
-      port: 25
-      skip_verify: true
-      from: drone@openprivacy.ca
-    when:
-      status: [ failure ]
-
-  - name: notify-gogs
-    image: openpriv/drone-gogs
-    when:
-      event: pull_request
-      status: [ success, changed, failure ]
-    environment:
-      GOGS_ACCOUNT_TOKEN:
-        from_secret: gogs_account_token
-    settings:
-      gogs_url: https://git.openprivacy.ca
-
-volumes:
-  # gopath where bin and pkg lives to persist across steps
-  - name: deps
-    temp: {}
-
-trigger:
-  repo: flutter/libcwtch-go
-  branch: trunk
-  event:
-    - push
-    - pull_request
-    - tag
--- a/.gitignore
+++ b/.gitignore
@ -3,4 +3,3 @@ cwtch-sources.jar
 cwtch.aar
 libCwtch.h
 libCwtch.so
-libCwtch.dll
--- a/8
+++ b/8
@ -8,8 +8,6 @@ linux: libCwtch.so

 android: cwtch.aar

-windows: libCwtch.dll
-
 libCwtch.so: lib.go 
 	./switch-ffi.sh
 	go build -buildmode c-shared -o libCwtch.so
@ -18,9 +16,5 @@ cwtch.aar: lib.go
 	./switch-gomobile.sh
 	gomobile bind -target android

-libCwtch.dll: lib.go
-	./switch-ffi.sh
-	GOOS=windows GOARCH=amd64 CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc-win32 go build -buildmode c-shared -o libCwtch.dll
-
 clean: 
-	rm -f cwtch.aar cwtch_go.apk libCwtch.h libCwtch.so cwtch-sources.jar libCwtch.dll
+	rm -f cwtch.aar cwtch_go.apk libCwtch.h libCwtch.so cwtch-sources.jar
--- a/constants/globals.go
+++ b/constants/globals.go
@ -1,5 +0,0 @@
-package constants
-
-// We offer "un-passworded" profiles but our storage encrypts everything with a password. We need an agreed upon
-// password to use in that case, that the app case use behind the scenes to password and unlock with
-const DefactoPasswordForUnencryptedProfiles = "be gay do crime"
--- a/features/contacts/contact_functionality.go
+++ b/features/contacts/contact_functionality.go
@ -1,41 +0,0 @@
-package contact
-
-import (
-	"cwtch.im/cwtch/model"
-	"cwtch.im/cwtch/peer"
-	"git.openprivacy.ca/flutter/libcwtch-go/features"
-	"git.openprivacy.ca/openprivacy/connectivity/tor"
-)
-
-// Functionality groups some common UI triggered functions for contacts...
-type Functionality struct {
-}
-
-const addContactPrefix = "addcontact"
-
-const sendMessagePrefix = "sendmessage"
-
-// FunctionalityGate returns contact.Functionality always
-func FunctionalityGate(experimentMap map[string]bool) (*Functionality, error) {
-	return new(Functionality), nil
-}
-
-// SendMessage handles sending messages to contacts
-func (pf *Functionality) SendMessage(peer peer.SendMessages, handle string, message string) features.Response {
-	eventID := peer.SendMessageToPeer(handle, message)
-	return features.ConstructResponse(sendMessagePrefix, eventID)
-}
-
-// HandleImportString handles contact import strings
-func (pf *Functionality) HandleImportString(peer peer.ModifyContactsAndPeers, importString string) features.Response {
-	if tor.IsValidHostname(importString) {
-		if peer.GetContact(importString) == nil {
-			peer.AddContact(importString, importString, model.AuthApproved)
-			// Implicit Peer Attempt
-			peer.PeerWithOnion(importString)
-			return features.ConstructResponse(addContactPrefix, "success")
-		}
-		return features.ConstructResponse(addContactPrefix, "contact_already_exists")
-	}
-	return features.ConstructResponse(addContactPrefix, "invalid_import_string")
-}
--- a/features/contacts/contact_functionality_addcontact_test.go
+++ b/features/contacts/contact_functionality_addcontact_test.go
@ -1,124 +0,0 @@
-package contact
-
-import (
-	"cwtch.im/cwtch/model"
-	"git.openprivacy.ca/flutter/libcwtch-go/features"
-	"testing"
-)
-
-const ValidHostname = "openpravyvc6spbd4flzn4g2iqu4sxzsizbtb5aqec25t76dnoo5w7yd"
-
-type MockPeer struct {
-	hasContact  bool
-	addContact  bool
-	peerRequest bool
-}
-
-func (m MockPeer) BlockUnknownConnections() {
-	panic("should never be called")
-}
-
-func (m MockPeer) AllowUnknownConnections() {
-	panic("should never be called")
-}
-
-func (m MockPeer) GetContacts() []string {
-	panic("should never be called")
-}
-
-func (m MockPeer) GetContact(s string) *model.PublicProfile {
-	if m.hasContact {
-		return &(model.GenerateNewProfile("").PublicProfile)
-	}
-	return nil
-}
-
-func (m MockPeer) GetContactAttribute(s string, s2 string) (string, bool) {
-	panic("should never be called")
-}
-
-func (m *MockPeer) AddContact(nick, onion string, authorization model.Authorization) {
-	m.addContact = true
-}
-
-func (m MockPeer) SetContactAuthorization(s string, authorization model.Authorization) error {
-	panic("should never be called")
-}
-
-func (m MockPeer) SetContactAttribute(s string, s2 string, s3 string) {
-	panic("should never be called")
-}
-
-func (m MockPeer) DeleteContact(s string) {
-	panic("should never be called")
-}
-
-func (m *MockPeer) PeerWithOnion(s string) {
-	m.peerRequest = true
-}
-
-func (m MockPeer) JoinServer(s string) error {
-	panic("should never be called")
-}
-
-func TestContactFunctionality_InValidHostname(t *testing.T) {
-	cf, _ := FunctionalityGate(map[string]bool{})
-
-	peer := &MockPeer{
-		hasContact:  false,
-		addContact:  false,
-		peerRequest: false,
-	}
-
-	response := cf.HandleImportString(peer, "")
-
-	if peer.addContact || peer.peerRequest {
-		t.Fatalf("HandleImportString for a malformed import string should have no resulted in addContact or a peerRequest: %v", peer)
-	}
-
-	if response.Error() != features.ConstructResponse(addContactPrefix, "invalid_import_string").Error() {
-		t.Fatalf("Response to a successful import is malformed: %v", response)
-	}
-
-}
-
-func TestContactFunctionality_ValidHostnameExistingContact(t *testing.T) {
-	cf, _ := FunctionalityGate(map[string]bool{})
-
-	peer := &MockPeer{
-		hasContact:  true,
-		addContact:  false,
-		peerRequest: false,
-	}
-
-	response := cf.HandleImportString(peer, ValidHostname)
-
-	if peer.addContact || peer.peerRequest {
-		t.Fatalf("HandleImportString for a valid string should not  call addContact or a peerRequest when the contact already exists: %v", peer)
-	}
-
-	if response.Error() != features.ConstructResponse(addContactPrefix, "contact_already_exists").Error() {
-		t.Fatalf("Response to a successful import is malformed: %v", response)
-	}
-
-}
-
-func TestContactFunctionality_ValidHostnameUnknownContact(t *testing.T) {
-	cf, _ := FunctionalityGate(map[string]bool{})
-
-	peer := &MockPeer{
-		hasContact:  false,
-		addContact:  false,
-		peerRequest: false,
-	}
-
-	response := cf.HandleImportString(peer, ValidHostname)
-
-	if peer.addContact && peer.peerRequest {
-		if response.Error() != features.ConstructResponse(addContactPrefix, "success").Error() {
-			t.Fatalf("Response to a successful import is malformed: %v", response)
-		}
-	} else {
-		t.Fatalf("HandleImportString for a valid import string should have resulted in addContact or a peerRequest: %v", peer)
-	}
-}
--- a/features/groups/group_functionality.go
+++ b/features/groups/group_functionality.go
@ -1,127 +0,0 @@
-package groups
-
-import (
-	"cwtch.im/cwtch/event"
-	"cwtch.im/cwtch/model"
-	"cwtch.im/cwtch/peer"
-	"encoding/base64"
-	"fmt"
-	"git.openprivacy.ca/flutter/libcwtch-go/features"
-	"git.openprivacy.ca/openprivacy/log"
-	"strings"
-)
-
-const serverPrefix = "server:"
-const tofuBundlePrefix = "tofubundle:"
-const groupPrefix = "torv3"
-const groupExperiment = "tapir-groups-experiment"
-
-const importBundlePrefix = "importBundle"
-
-const (
-	// ServerList is a json encoded list of servers
-	ServerList = event.Field("ServerList")
-)
-
-const (
-	// UpdateServerInfo is an event containing a ProfileOnion and a ServerList
-	UpdateServerInfo = event.Type("UpdateServerInfo")
-)
-
-// ReadServerInfo is a meta-interface for reading information about servers..
-type ReadServerInfo interface {
-	peer.ReadContacts
-	peer.ReadServers
-}
-
-// GroupFunctionality provides experiment gated server functionality
-type GroupFunctionality struct {
-}
-
-// ExperimentGate returns GroupFunctionality if the experiment is enabled, and an error otherwise.
-func ExperimentGate(experimentMap map[string]bool) (*GroupFunctionality, error) {
-	if experimentMap[groupExperiment] {
-		return new(GroupFunctionality), nil
-	}
-	return nil, fmt.Errorf("gated by %v", groupExperiment)
-}
-
-// SendMessage is a deprecated api
-func (gf *GroupFunctionality) SendMessage(peer peer.CwtchPeer, handle string, message string) (string, error) {
-	// TODO this auto accepting behaviour needs some thinking through
-	if !peer.GetGroup(handle).Accepted {
-		err := peer.AcceptInvite(handle)
-		if err != nil {
-			log.Errorf("tried to mark a nonexistent group as existed. bad!")
-			return "", err
-		}
-	}
-	return peer.SendMessageToGroupTracked(handle, message)
-}
-
-// ValidPrefix returns true if an import string contains a prefix that indicates it contains information about a
-// server or a group
-func (gf *GroupFunctionality) ValidPrefix(importString string) bool {
-	return strings.HasPrefix(importString, tofuBundlePrefix) || strings.HasPrefix(importString, serverPrefix) || strings.HasPrefix(importString, groupPrefix)
-}
-
-// GetServerInfoList compiles all the information the UI might need regarding all servers..
-func (gf *GroupFunctionality) GetServerInfoList(profile ReadServerInfo) []Server {
-	var servers []Server
-	for _, server := range profile.GetServers() {
-		servers = append(servers, gf.GetServerInfo(server, profile))
-	}
-	return servers
-}
-
-// GetServerInfo compiles all the information the UI might need regarding a particular server including any verified
-// cryptographic keys
-func (gf *GroupFunctionality) GetServerInfo(serverOnion string, profile peer.ReadContacts) Server {
-	serverInfo := profile.GetContact(serverOnion)
-	keyTypes := []model.KeyType{model.KeyTypeServerOnion, model.KeyTypeTokenOnion, model.KeyTypePrivacyPass}
-	var serverKeys []ServerKey
-
-	for _, keyType := range keyTypes {
-		if key, has := serverInfo.GetAttribute(string(keyType)); has {
-			serverKeys = append(serverKeys, ServerKey{Type: string(keyType), Key: key})
-		}
-	}
-	return Server{Onion: serverOnion, Status: serverInfo.State, Keys: serverKeys}
-}
-
-// HandleImportString handles import strings for groups and servers
-func (gf *GroupFunctionality) HandleImportString(peer peer.CwtchPeer, importString string) error {
-	if strings.HasPrefix(importString, tofuBundlePrefix) {
-		bundle := strings.Split(importString, "||")
-		if len(bundle) == 2 {
-			err := gf.HandleImportString(peer, bundle[0][len(tofuBundlePrefix):])
-			// if the server import failed then abort the whole process..
-			if !strings.HasSuffix(err.Error(), "success") {
-				return features.ConstructResponse(importBundlePrefix, err.Error())
-			}
-			return gf.HandleImportString(peer, bundle[1])
-		}
-	} else if strings.HasPrefix(importString, serverPrefix) {
-		// Server Key Bundles are prefixed with
-		bundle, err := base64.StdEncoding.DecodeString(importString[len(serverPrefix):])
-		if err == nil {
-			if err = peer.AddServer(string(bundle)); err != nil {
-				return features.ConstructResponse(importBundlePrefix, err.Error())
-			}
-			return features.ConstructResponse(importBundlePrefix, "success")
-		}
-		return features.ConstructResponse(importBundlePrefix, err.Error())
-	} else if strings.HasPrefix(importString, groupPrefix) {
-		//eg: torv3JFDWkXExBsZLkjvfkkuAxHsiLGZBk0bvoeJID9ItYnU=EsEBCiBhOWJhZDU1OTQ0NWI3YmM2N2YxYTM5YjkzMTNmNTczNRIgpHeNaG+6jy750eDhwLO39UX4f2xs0irK/M3P6mDSYQIaOTJjM2ttb29ibnlnaGoyenc2cHd2N2Q1N3l6bGQ3NTNhdW8zdWdhdWV6enB2ZmFrM2FoYzRiZHlkCiJAdVSSVgsksceIfHe41OJu9ZFHO8Kwv3G6F5OK3Hw4qZ6hn6SiZjtmJlJezoBH0voZlCahOU7jCOg+dsENndZxAA==
-		if gid, err := peer.ImportGroup(importString); err != nil {
-			return features.ConstructResponse(importBundlePrefix, err.Error())
-		} else {
-			// Auto accept the group here.
-			if peer.AcceptInvite(gid) != nil {
-				log.Errorf("Error accepting invite: %v", err)
-			}
-			return features.ConstructResponse(importBundlePrefix, "success")
-		}
-	}
-	return features.ConstructResponse(importBundlePrefix, "invalid_group_invite_prefix")
-}
--- a/features/groups/group_functionality_test.go
+++ b/features/groups/group_functionality_test.go
@ -1,39 +0,0 @@
-package groups
-
-import "testing"
-
-func TestGroupFunctionality_ValidPrefix(t *testing.T) {
-	gf, _ := ExperimentGate(map[string]bool{groupExperiment: true})
-	if gf.ValidPrefix("torv3blahblahblah") == false {
-		t.Fatalf("torv3 should be a valid prefix")
-	}
-	if gf.ValidPrefix("tofubundle:32432423||3242342") == false {
-		t.Fatalf("tofubundle should be a valid prefix")
-	}
-	if gf.ValidPrefix("server:23541233t") == false {
-		t.Fatalf("server should be a valid prefix")
-	}
-	if gf.ValidPrefix("alice!24234") == true {
-		t.Fatalf("alice should be an invalid predix")
-	}
-}
-
-func TestGroupFunctionality_IsEnabled(t *testing.T) {
-
-	_, err := ExperimentGate(map[string]bool{})
-
-	if err == nil {
-		t.Fatalf("group functionality should be disabled")
-	}
-
-	_, err = ExperimentGate(map[string]bool{groupExperiment: true})
-
-	if err != nil {
-		t.Fatalf("group functionality should be enabled")
-	}
-
-	_, err = ExperimentGate(map[string]bool{groupExperiment: false})
-	if err == nil {
-		t.Fatalf("group functionality should be disabled")
-	}
-}
--- a/features/groups/server.go
+++ b/features/groups/server.go
@ -1,12 +0,0 @@
-package groups
-
-type ServerKey struct {
-	Type string `json:"type"`
-	Key  string `json:"key"`
-}
-
-type Server struct {
-	Onion  string      `json:"onion"`
-	Status string      `json:"status"`
-	Keys   []ServerKey `json:"keys"`
-}
--- a/features/response.go
+++ b/features/response.go
@ -1,13 +0,0 @@
-package features
-
-import "errors"
-
-// Response is a wrapper to better semantically convey the response type...
-type Response error
-
-const errorSeparator = "."
-
-// ConstructResponse is a helper function for creating Response structures.
-func ConstructResponse(prefix string, error string) Response {
-	return errors.New(prefix + errorSeparator + error)
-}
--- a/go.mod
+++ b/go.mod
@ -3,8 +3,8 @@ module git.openprivacy.ca/flutter/libcwtch-go
 go 1.15

 require (
-	cwtch.im/cwtch v0.8.11
-	git.openprivacy.ca/openprivacy/connectivity v1.4.4
+	cwtch.im/cwtch v0.5.1
+	git.openprivacy.ca/openprivacy/connectivity v1.3.3
 	git.openprivacy.ca/openprivacy/log v1.0.2
-	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
+	golang.org/x/mobile v0.0.0-20210208171126-f462b3930c8f // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,74 +1,93 @@
-cwtch.im/cwtch v0.8.11 h1:nUrd6srjLxInSJ0q1JdmRBhN4RRlZRL+2vIyE/AXkfY=
-cwtch.im/cwtch v0.8.11/go.mod h1:D9dtO+WnKqdmufKSfFeFlUYaxLTfE/RtqVe1OD0kiKc=
-git.openprivacy.ca/cwtch.im/tapir v0.4.3 h1:sctSfUXHDIqaHfJPDl+5lHtmoEJolQiHTcHZGAe5Qc4=
-git.openprivacy.ca/cwtch.im/tapir v0.4.3/go.mod h1:10qEaib5x021zgyZ/97JKWsEpedH5+Vfy2CvB2V+08E=
+cwtch.im v0.4.11 h1:2FdbstCo8a2pSoM9+FnH9H8IL8TYpNgEDA6+vcstqWI=
+cwtch.im/cwtch v0.5.1 h1:84foD/HBebPbA4gUEwp+feakeHkD3Di53Q3FnSbqDMM=
+cwtch.im/cwtch v0.5.1/go.mod h1:snHZIZwRQPAZG2LRZsN5SpAIbeR597VJoDS+KHm7q9w=
+cwtch.im/tapir v0.2.1 h1:t1YJB9q5sV1A9xwiiwL6WVfw3dwQWLoecunuzT1PQtw=
+cwtch.im/tapir v0.2.1/go.mod h1:xzzZ28adyUXNkYL1YodcHsAiTt3IJ8Loc29YVn9mIEQ=
 git.openprivacy.ca/openprivacy/bine v0.0.4 h1:CO7EkGyz+jegZ4ap8g5NWRuDHA/56KKvGySR6OBPW+c=
 git.openprivacy.ca/openprivacy/bine v0.0.4/go.mod h1:13ZqhKyqakDsN/ZkQkIGNULsmLyqtXc46XBcnuXm/mU=
-git.openprivacy.ca/openprivacy/connectivity v1.4.4 h1:11M3akVCyy/luuhMpZTM1r9Jayl7IHD944Bxsn2FDpU=
-git.openprivacy.ca/openprivacy/connectivity v1.4.4/go.mod h1:JVRCIdL+lAG6ohBFWiKeC/MN42nnC0sfFszR9XG6vPQ=
+git.openprivacy.ca/openprivacy/connectivity v1.2.0/go.mod h1:B7vzuVmChJtSKoh0ezph5vu6DQ0gIk0zHUNG6IgXCcA=
+git.openprivacy.ca/openprivacy/connectivity v1.3.3 h1:OKHZ/pzY95+UNOhF74DisSYPh7lULtjbxFQnK9r6cAk=
+git.openprivacy.ca/openprivacy/connectivity v1.3.3/go.mod h1:DL9QitHjpyNspMUe3wjIej9gFgDK2FdRKP2JE4+7T90=
+git.openprivacy.ca/openprivacy/log v1.0.0/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw=
+git.openprivacy.ca/openprivacy/log v1.0.1/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw=
 git.openprivacy.ca/openprivacy/log v1.0.2 h1:HLP4wsw4ljczFAelYnbObIs821z+jgMPCe8uODPnGQM=
 git.openprivacy.ca/openprivacy/log v1.0.2/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cretz/bine v0.1.1-0.20200124154328-f9f678b84cca/go.mod h1:6PF6fWAvYtwjRGkAuDEJeWNOv3a2hUouSP/yRYXmvHw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU=
 github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is=
 github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s=
 github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc=
 github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0=
 github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/struCoder/pidusage v0.1.3/go.mod h1:pWBlW3YuSwRl6h7R5KbvA4N8oOqe9LjaKW5CwT1SPjI=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.etcd.io/bbolt v1.3.4 h1:hi1bXHMVrlQh6WwxAy+qZCV/SYIlqo+Ushwdpa4tAKg=
 go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200206161412-a0c6ece9d31a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee h1:4yd7jl+vXjalO5ztz6Vc1VADv+S/80LGJmyl1ROJ2AI=
 golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f h1:kgfVkAEEQXXQ0qc6dH7n6y37NAYmTFmz0YRwrRjgxKw=
+golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
+golang.org/x/mobile v0.0.0-20210208171126-f462b3930c8f h1:aEcjdTsycgPqO/caTgnxfR9xwWOltP/21vtJyFztEy0=
+golang.org/x/mobile v0.0.0-20210208171126-f462b3930c8f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201010224723-4f7140c49acb h1:mUVeFHoDKis5nxCAzoAi7E8Ghb86EXh/RK6wtvJIqRY=
 golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.0.0-20200625195345-7480c7b4547d h1:V1BGE5ZHrUIYZYNEm0i7jrPwSo3ks0HSn1TrartSqME=
+golang.org/x/tools v0.0.0-20200625195345-7480c7b4547d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- a/lib.go
+++ b/lib.go
@ -1,5 +1,4 @@
 //package cwtch
-
 package main

 import "C"
@ -7,19 +6,14 @@ import (
 	"crypto/rand"
 	"cwtch.im/cwtch/app"
 	"cwtch.im/cwtch/event"
-	"cwtch.im/cwtch/model"
 	"cwtch.im/cwtch/model/attr"
+
 	"cwtch.im/cwtch/peer"
+
 	"encoding/json"
 	"fmt"
 	"git.openprivacy.ca/flutter/libcwtch-go/constants"
-	contact "git.openprivacy.ca/flutter/libcwtch-go/features/contacts"
-	"git.openprivacy.ca/flutter/libcwtch-go/features/groups"
 	"git.openprivacy.ca/flutter/libcwtch-go/utils"
-	"git.openprivacy.ca/openprivacy/connectivity"
-	"runtime"
-	"strconv"
-	"strings"

 	"encoding/base64"
 	"git.openprivacy.ca/openprivacy/connectivity/tor"
@ -31,78 +25,23 @@ import (
 	"time"
 )

-const (
-	// ProfileOnion is an event field that contains the handle for a given profile.
-	// todo: this should probably be moved back into Cwtch, and renamed ProfileHandle (onions are too tor-specific)
-	ProfileOnion = event.Field("ProfileOnion")
-)
-
 var application app.Application
 var eventHandler *utils.EventHandler
 var acnQueue event.Queue
 var contactEventsQueue event.Queue
-var globalACN connectivity.ACN
-
-// ChatMessage API currently not officially documented, see
-// https://git.openprivacy.ca/cwtch.im/secure-development-handbook/issues/3
-// for latest updates for now
-//
-// A ChatMessage is the application-layer Cwtch message, delivered to the UI
-// as serialized json.
-type ChatMessage struct {
-	O int    `json:"o"`
-	D string `json:"d"`
-}

 //export c_StartCwtch
-func c_StartCwtch(dir_c *C.char, len C.int, tor_c *C.char, torLen C.int) int8 {
+func c_StartCwtch(dir_c *C.char, len C.int, tor_c *C.char, torLen C.int) {
 	dir := C.GoStringN(dir_c, len)
 	tor := C.GoStringN(tor_c, torLen)
-	return int8(StartCwtch(dir, tor))
+	StartCwtch(dir, tor)
 }

-// StartCwtch starts cwtch in the library and initlaizes all data structures
-// 	 GetAppbusEvents is always safe to use
-//   the rest of functions are unsafe until the CwtchStarted event has been received indicating StartCwtch has completed
-//   returns:
-//     message: CwtchStarted when start up is complete and app is safe to use
-//              CwtchStartError message when start up fails (includes event.Error data field)
-func StartCwtch(appDir string, torPath string) int {
-	log.SetLevel(log.LevelInfo)
+func StartCwtch(appDir string, torPath string) {
+	log.SetLevel(log.LevelDebug)
+	//log.ExcludeFromPattern("service.go")

-
-	log.Infof("StartCwtch(...)")
-	// Quick hack check that we're being called with the correct params
-	// On android a stale worker could be calling us with "last apps" directory. Best to abort fast so the app can make a new worker
-	if runtime.GOOS == "android" {
-		fh, err := os.Open(torPath)
-		if err != nil {
-			log.Errorf("%v", err)
-			log.Errorf("failed to stat tor, skipping StartCwtch(). potentially normal if the app was reinstalled or the device was restarted; this workorder should get canceled soon")
-			return 1
-		}
-		_ = fh.Close()
-	}
-	go _startCwtch(appDir, torPath)
-	return 0
-}
-
-func _startCwtch(appDir string, torPath string) {
-	log.Infof("application: %v eventHandler: %v acn: %v", application, eventHandler, globalACN)
-
-	if application != nil {
-		log.Infof("_startCwtch detected existing application; resuming instead of relaunching")
-		ReconnectCwtchForeground()
-		return
-	}
-
-	// Exclude Tapir wire Messages
-	//(We need a TRACE level)
-	log.ExcludeFromPattern("service.go")
-
-	// Ensure that the application directory exists...and then initialize settings..
-	os.MkdirAll(path.Join(appDir), 0700)
-	utils.InitGlobalSettingsFile(appDir, constants.DefactoPasswordForUnencryptedProfiles)
+	utils.InitGlobalSettingsFile(appDir, "be gay do crime")

 	log.Infof("Loading Cwtch Directory %v and tor path: %v", appDir, torPath)

@ -117,104 +56,57 @@ func _startCwtch(appDir string, torPath string) {
 		panic(err)
 	}

-	log.Infof("Creating new EventHandler()")
-	eventHandler = utils.NewEventHandler()
-
 	log.Infof("making directory %v", appDir)
 	os.MkdirAll(path.Join(appDir, "/.tor", "tor"), 0700)
 	tor.NewTorrc().WithSocksPort(port).WithOnionTrafficOnly().WithControlPort(controlPort).WithHashedPassword(base64.StdEncoding.EncodeToString(key)).Build(filepath.Join(appDir, ".tor", "tor", "torrc"))
-	acn, err := tor.NewTorACNWithAuth(path.Join(appDir, "/.tor"), torPath, controlPort, tor.HashedPasswordAuthenticator{Password: base64.StdEncoding.EncodeToString(key)})
+	acn, err := tor.NewTorACNWithAuth(path.Join(appDir, "/.tor"), torPath, controlPort, tor.HashedPasswordAuthenticator{base64.StdEncoding.EncodeToString(key)})
 	if err != nil {
-		log.Errorf("\nError connecting to Tor replacing with ErrorACN: %v\n", err)
-		eventHandler.PublishAppEvent(event.NewEventList(utils.CwtchStartError, event.Error, err))
-		return
+		log.Errorf("\nError connecting to Tor: %v\n", err)
 	}
-	globalACN = acn
+	//acn.WaitTillBootstrapped()
+
 	newApp := app.NewApp(acn, appDir)
 	acnQueue = event.NewQueue()
 	newApp.GetPrimaryBus().Subscribe(event.ACNStatus, acnQueue)
 	newApp.GetPrimaryBus().Subscribe(utils.UpdateGlobalSettings, acnQueue)
-	newApp.GetPrimaryBus().Subscribe(utils.SetLoggingLevel, acnQueue)
-	newApp.GetPrimaryBus().Subscribe(event.AppError, acnQueue)

-	eventHandler.HandleApp(newApp)
+	eventHandler = utils.NewEventHandler(newApp)

 	peer.DefaultEventsToHandle = []event.Type{
 		event.EncryptedGroupMessage,
 		event.NewMessageFromPeer,
 		event.PeerAcknowledgement,
+		event.NewGroupInvite,
 		event.PeerError,
-		event.SendMessageToPeerError,
 		event.SendMessageToGroupError,
 		event.NewGetValMessageFromPeer,
 		event.PeerStateChange,
 		event.NewRetValMessageFromPeer,
 		event.NewGroupInvite,
 		event.ServerStateChange,
-		event.ProtocolEngineStopped,
-		event.RetryServerRequest,
 	}
 	settings := utils.ReadGlobalSettings()
 	settingsJson, _ := json.Marshal(settings)

-	newApp.LoadProfiles(constants.DefactoPasswordForUnencryptedProfiles)
+	newApp.LoadProfiles("be gay do crime")
+	newApp.LaunchPeers()
 	application = newApp
-
-	// Send global settings to the UI...
 	application.GetPrimaryBus().Publish(event.NewEvent(utils.UpdateGlobalSettings, map[event.Field]string{event.Data: string(settingsJson)}))
-	log.Infof("libcwtch-go application launched")
-	application.GetPrimaryBus().Publish(event.NewEvent(utils.CwtchStarted, map[event.Field]string{}))
-	application.QueryACNVersion()
+	log.Infof("libcwtch-go application SET\n")
 }

-//export c_ReconnectCwtchForeground
-func c_ReconnectCwtchForeground() {
-	ReconnectCwtchForeground()
+//export c_ACNEvents
+func c_ACNEvents() *C.char {
+	return C.CString(ACNEvents())
 }

-// Like StartCwtch, but StartCwtch has already been called so we don't need to restart Tor etc (probably)
-// Do need to re-send initial state tho, eg profiles that are already loaded
-func ReconnectCwtchForeground() {
-	log.Infof("Reconnecting cwtchforeground")
-	if application == nil {
-		log.Errorf("ReconnectCwtchForeground: Application is nil, presuming stale thread, EXITING Reconnect\n")
-		return
+func ACNEvents() string {
+	select {
+	case myevent := <-acnQueue.OutChan():
+		return fmt.Sprintf("%v", myevent)
+	default:
+		return ""
 	}
-
-	// populate profile list
-	peerList := application.ListPeers()
-	for onion := range peerList {
-		eventHandler.Push(event.NewEvent(event.NewPeer, map[event.Field]string{event.Identity: onion, event.Created: event.False, "Reload": event.True}))
-	}
-
-	for onion := range peerList {
-		// fix peerpeercontact message counts
-		contactList := application.GetPeer(onion).GetContacts()
-		for _, handle := range contactList {
-			totalMessages := application.GetPeer(onion).GetContact(handle).Timeline.Len() + len(application.GetPeer(onion).GetContact(handle).UnacknowledgedMessages)
-			eventHandler.Push(event.NewEvent(event.MessageCounterResync, map[event.Field]string{
-				event.Identity: onion,
-				event.RemotePeer: handle,
-				event.Data: strconv.Itoa(totalMessages),
-			}))
-		}
-		
-		// fix peergroupcontact message counts
-		groupList := application.GetPeer(onion).GetGroups()
-		for _, groupID := range groupList {
-			totalMessages := application.GetPeer(onion).GetGroup(groupID).Timeline.Len() + len(application.GetPeer(onion).GetGroup(groupID).UnacknowledgedMessages)
-			eventHandler.Push(event.NewEvent(event.MessageCounterResync, map[event.Field]string{
-				event.Identity: onion,
-				event.GroupID: groupID,
-				event.Data: strconv.Itoa(totalMessages),
-			}))
-		}
-	}
-
-
-	application.GetPrimaryBus().Publish(event.NewEvent(utils.CwtchStarted, map[event.Field]string{}))
-	application.QueryACNStatus()
-	application.QueryACNVersion()
 }

 //export c_SendAppEvent
@ -243,45 +135,6 @@ func SendAppEvent(eventJson string) {
 		}
 		log.Debugf("New Settings %v", globalSettings)
 		utils.WriteGlobalSettings(globalSettings)
-
-		// Group Experiment Refresh
-		groupHandler, err := groups.ExperimentGate(utils.ReadGlobalSettings().Experiments)
-		if err == nil {
-			for profileOnion := range application.ListPeers() {
-				serverListForOnion := groupHandler.GetServerInfoList(application.GetPeer(profileOnion))
-				serversListBytes, _ := json.Marshal(serverListForOnion)
-				eventHandler.Push(event.NewEvent(groups.UpdateServerInfo, map[event.Field]string{"ProfileOnion": profileOnion, groups.ServerList: string(serversListBytes)}))
-			}
-		}
-
-		// Explicitly toggle blocking/unblocking of unknown connections for profiles
-		// that have been loaded.
-		if utils.ReadGlobalSettings().BlockUnknownConnections {
-			for onion := range application.ListPeers() {
-				application.GetPeer(onion).BlockUnknownConnections()
-			}
-		} else {
-			for onion := range application.ListPeers() {
-				application.GetPeer(onion).AllowUnknownConnections()
-			}
-		}
-
-	case utils.SetLoggingLevel:
-		_, warn := new_event.Data[utils.Warn]
-		_, error := new_event.Data[utils.Error]
-		_, debug := new_event.Data[utils.Debug]
-		_, info := new_event.Data[utils.Info]
-		// Assign logging level in priority order. The highest logging level wins in the
-		// event of multiple fields.
-		if info {
-			log.SetLevel(log.LevelInfo)
-		} else if warn {
-			log.SetLevel(log.LevelWarn)
-		} else if error {
-			log.SetLevel(log.LevelError)
-		} else if debug {
-			log.SetLevel(log.LevelDebug)
-		}
 	default: // do nothing
 	}
 }
@ -294,11 +147,6 @@ func c_SendProfileEvent(onion_ptr *C.char, onion_len C.int, json_ptr *C.char, js
 	SendProfileEvent(onion, eventJson)
 }

-const (
-	AddContact   = event.Type("AddContact")
-	ImportString = event.Field("ImportString")
-)
-
 // SendProfileEvent is a generic method for Rebroadcasting Profile Events from a UI
 func SendProfileEvent(onion string, eventJson string) {
 	// Convert the Event Json back to a typed Event Struct, this will make the
@ -316,23 +164,8 @@ func SendProfileEvent(onion string, eventJson string) {
 	// We need to update the local cache
 	// Ideally I think this would be pushed back into Cwtch
 	switch new_event.EventType {
-	case AddContact:
-		// Peer Functionality is Always Enabled, so we forgo the existence check...
-		// TODO: Combine with GroupFunctionality to make a meta-handleimportstring that can do both!
-		pf, _ := contact.FunctionalityGate(utils.ReadGlobalSettings().Experiments)
-		err := pf.HandleImportString(peer, new_event.Data[ImportString])
-		eventHandler.Push(event.NewEvent(event.AppError, map[event.Field]string{event.Data: err.Error()}))
 	case event.SetAttribute:
 		peer.SetAttribute(new_event.Data[event.Key], new_event.Data[event.Data])
-	case event.SetPeerAttribute:
-		peer.SetContactAttribute(new_event.Data[event.RemotePeer], new_event.Data[event.Key], new_event.Data[event.Data])
-	case event.SetPeerAuthorization:
-		peer.SetContactAuthorization(new_event.Data[event.RemotePeer], model.Authorization(new_event.Data[event.Authorization]))
-
-		// If approved (e.g. after an unblock) we want to kick off peering again...
-		if model.Authorization(new_event.Data[event.Authorization]) == model.AuthApproved {
-			peer.PeerWithOnion(new_event.Data[event.RemotePeer])
-		}
 	default:
 		// rebroadcast catch all
 		log.Infof("Received Event %v for %v but no libCwtch handler found, relaying the event directly", new_event, onion)
@ -347,38 +180,97 @@ func c_GetAppBusEvent() *C.char {

 // GetAppBusEvent blocks until an event
 func GetAppBusEvent() string {
-	log.Debugf("appbusevent called")
-	for eventHandler == nil {
-		log.Debugf("waiting for eventHandler != nil")
-		time.Sleep(time.Second)
-	}
-
 	var json = ""
 	for json == "" {
-		log.Debugf("waiting for json != ''")
 		json = eventHandler.GetNextEvent()
 	}
-	log.Debugf("appbusevent: %v", json)
 	return json
 }

+//export c_GetProfileRepaintEvent
+func c_GetProfileRepaintEvent() int8 {
+	if GetProfileRepaintEvent() {
+		return 1
+	} else {
+		return 0
+	}
+}
+
+func GetProfileRepaintEvent() bool {
+	<-acnQueue.OutChan()
+	return true
+}
+
 type Profile struct {
 	Name      string `json:"name"`
 	Onion     string `json:"onion"`
 	ImagePath string `json:"imagePath"`
 }

+//export c_GetProfiles
+func c_GetProfiles() *C.char {
+	return C.CString(GetProfiles())
+}
+
+func GetProfiles() string {
+	peerList := application.ListPeers()
+	profiles := make([]Profile, len(peerList))
+	i := 0
+	for onion := range peerList {
+		name, _ := application.GetPeer(onion).GetAttribute(attr.GetPublicScope(constants.Name))
+		profiles[i] = Profile{
+			Name:      name,
+			Onion:     onion,
+			ImagePath: "",
+		}
+		i += 1
+	}
+	jsonBytes, _ := json.Marshal(profiles)
+	return string(jsonBytes)
+}
+
+//export c_GetContacts
+func c_GetContacts(onion_ptr *C.char, onion_len C.int) *C.char {
+	return C.CString(GetContacts(C.GoStringN(onion_ptr, onion_len)))
+}
+
+func GetContacts(onion string) string {
+	log.Infof("Get Contacts for %v", onion)
+	mypeer := application.GetPeer(onion)
+
+	contactEventsQueue = event.NewQueue()
+	application.GetEventBus(onion).Subscribe(event.PeerStateChange, contactEventsQueue)
+
+	var contacts []utils.Contact
+	for _, contact := range mypeer.GetContacts() {
+		contactInfo := mypeer.GetContact(contact)
+		log.Infof("contactInfo %v", contactInfo)
+		contacts = append(contacts, utils.Contact{Name: contactInfo.Name, Onion: contactInfo.Onion, Status: contactInfo.State})
+	}
+
+	bytes, _ := json.Marshal(contacts)
+	return string(bytes)
+}
+
 //export c_CreateProfile
 func c_CreateProfile(nick_ptr *C.char, nick_len C.int, pass_ptr *C.char, pass_len C.int) {
 	CreateProfile(C.GoStringN(nick_ptr, nick_len), C.GoStringN(pass_ptr, pass_len))
 }

 func CreateProfile(nick, pass string) {
-	if pass == constants.DefactoPasswordForUnencryptedProfiles {
-		application.CreateTaggedPeer(nick, pass, constants.ProfileTypeV1DefaultPassword)
-	} else {
-		application.CreateTaggedPeer(nick, pass, constants.ProfileTypeV1Password)
-	}
+	application.CreatePeer(nick, pass)
+}
+
+//export c_SelectProfile
+func c_SelectProfile(onion_ptr *C.char, onion_len C.int) *C.char {
+	return C.CString(SelectProfile(C.GoStringN(onion_ptr, onion_len)))
+}
+
+func SelectProfile(onion string) string {
+	log.Infof("Select Profile: %v", onion)
+	contactEventsQueue = event.NewQueue()
+	application.GetEventBus(onion).Subscribe(event.PeerStateChange, contactEventsQueue)
+	return ""
 }

 //export c_LoadProfiles
@ -404,82 +296,17 @@ func ContactEvents() string {
 	}
 }

-//export c_AcceptContact
-func c_AcceptContact(profilePtr *C.char, profileLen C.int, handlePtr *C.char, handleLen C.int) {
-	AcceptContact(C.GoStringN(profilePtr, profileLen), C.GoStringN(handlePtr, handleLen))
-}
-
-// AcceptContact takes in a profileOnion and a handle to either a group or a peer and authorizes the handle
-// for further action (e.g. messaging / connecting to the server / joining the group etc.)
-func AcceptContact(profileOnion string, handle string) {
-	profile := application.GetPeer(profileOnion)
-	profileHandler := utils.NewPeerHelper(profile)
-	if profileHandler.IsGroup(handle) {
-		profile.AcceptInvite(handle)
-	} else {
-		err := profile.SetContactAuthorization(handle, model.AuthApproved)
-		if err == nil {
-			eventHandler.Push(event.NewEvent(event.PeerStateChange, map[event.Field]string{
-				ProfileOnion:     profileOnion,
-				event.RemotePeer: handle,
-				"authorization":  string(model.AuthApproved),
-			}))
-		} else {
-			log.Errorf("error accepting contact: %s", err.Error())
-		}
-	}
-}
-
-//export c_RejectInvite
-func c_RejectInvite(profilePtr *C.char, profileLen C.int, handlePtr *C.char, handleLen C.int) {
-	RejectInvite(C.GoStringN(profilePtr, profileLen), C.GoStringN(handlePtr, handleLen))
-}
-
-// RejectInvite rejects a group invite
-func RejectInvite(profileOnion string, handle string) {
-	log.Debugf("rejecting invite %v for %v", handle, profileOnion)
-	profile := application.GetPeer(profileOnion)
-	profileHandler := utils.NewPeerHelper(profile)
-	if profileHandler.IsGroup(handle) {
-		profile.RejectInvite(handle)
-		log.Debugf("successfully rejected invite %v for %v", handle, profileOnion)
-	}
-}
-
-//export c_BlockContact
-func c_BlockContact(profilePtr *C.char, profileLen C.int, handlePtr *C.char, handleLen C.int) {
-	BlockContact(C.GoStringN(profilePtr, profileLen), C.GoStringN(handlePtr, handleLen))
-}
-
-func BlockContact(profile, handle string) {
-	err := application.GetPeer(profile).SetContactAuthorization(handle, model.AuthBlocked)
-	if err == nil {
-		eventHandler.Push(event.NewEvent(event.PeerStateChange, map[event.Field]string{
-			ProfileOnion:     profile,
-			event.RemotePeer: handle,
-			"authorization":  string(model.AuthBlocked),
-		}))
-	} else {
-		log.Errorf("error blocking contact: %s", err.Error())
-	}
-}
-
-//export c_UpdateMessageFlags
-func c_UpdateMessageFlags(profile_ptr *C.char, profile_len C.int, handle_ptr *C.char, handle_len C.int, mIdx C.int, message_flags C.ulong) {
+//export c_NumMessages
+func c_NumMessages(profile_ptr *C.char, profile_len C.int, handle_ptr *C.char, handle_len C.int) (n int) {
 	profile := C.GoStringN(profile_ptr, profile_len)
 	handle := C.GoStringN(handle_ptr, handle_len)
-	UpdateMessageFlags(profile, handle, int(mIdx), int64(message_flags))
+	return (NumMessages(profile, handle))
 }

-// UpdateMessageFlags sets the messages flags on a given message for a given profile.
-// gomobile doesn't support uint64...so here we are....
-func UpdateMessageFlags(profileOnion, handle string, mIdx int, flags int64) {
-	profile := application.GetPeer(profileOnion)
-	if profile != nil {
-		profile.UpdateMessageFlags(handle, mIdx, uint64(flags))
-	} else {
-		log.Errorf("called updatemessageflags with invalid profile onion")
-	}
+func NumMessages(profile, handle string) (n int) {
+	n = len(application.GetPeer(profile).GetContact(handle).Timeline.Messages)
+	log.Infof("NumMessagse(%s, %s) = %d", profile, handle, n)
+	return
 }

 //export c_GetMessage
@ -489,255 +316,25 @@ func c_GetMessage(profile_ptr *C.char, profile_len C.int, handle_ptr *C.char, ha
 	return C.CString(GetMessage(profile, handle, int(message_index)))
 }

-// EnhancedMessage wraps a Cwtch model.Message with some additional data to reduce calls from the UI.
-type EnhancedMessage struct {
-	model.Message
-	ContactImage string
-}
-
-func GetMessage(profileOnion, handle string, message_index int) string {
-	profile := application.GetPeer(profileOnion)
-	ph := utils.NewPeerHelper(profile)
-	var message EnhancedMessage
-	if ph.IsGroup(handle) {
-		if len(profile.GetGroup(handle).Timeline.Messages) > message_index {
-			message.Message = profile.GetGroup(handle).Timeline.Messages[message_index]
-			message.ContactImage = ph.GetProfilePic(message.Message.PeerID)
-		} else {
-			// Message Index Request exceeded Timeline, most likely reason is this is a request for an
-			// unacknowledged sent message (it can take a many seconds for a message to be confirmed in the worst
-			// case).
-			offset := message_index - len(profile.GetGroup(handle).Timeline.Messages)
-			if len(profile.GetGroup(handle).UnacknowledgedMessages) > offset {
-				message.Message = profile.GetGroup(handle).UnacknowledgedMessages[offset]
-				message.ContactImage = ph.GetProfilePic(message.Message.PeerID)
-			} else {
-				log.Errorf("Couldn't find message in timeline or unacked messages, probably transient threading issue, but logging for visibility..")
-			}
-		}
-	} else {
-		if message_index < len(profile.GetContact(handle).Timeline.Messages) {
-			message.Message = profile.GetContact(handle).Timeline.Messages[message_index]
-			message.ContactImage = ph.GetProfilePic(handle)
-		} else {
-			log.Errorf("peerpeercontact getmessage out of range; sending counter resync just in case")
-			eventHandler.Push(event.NewEvent(event.MessageCounterResync, map[event.Field]string{
-				event.Identity: profileOnion,
-				event.RemotePeer: handle,
-				event.Data: strconv.Itoa(len(profile.GetContact(handle).Timeline.Messages)),
-			}))
-		}
-	}
+// Deprecate - 2021.01.14 - not used
+func GetMessage(profile, handle string, message_index int) string {
+	message := application.GetPeer(profile).GetContact(handle).Timeline.Messages[message_index]
 	bytes, _ := json.Marshal(message)
+	log.Infof("GetMessage(%s, %s, %d) = %s", profile, handle, message_index, string(bytes))
 	return string(bytes)
 }

-
-//export c_SendMessage
-func c_SendMessage(profile_ptr *C.char, profile_len C.int, handle_ptr *C.char, handle_len C.int, msg_ptr *C.char, msg_len C.int) {
+//export c_GetMessages
+func c_GetMessages(profile_ptr *C.char, profile_len C.int, handle_ptr *C.char, handle_len C.int, start C.int, end C.int) *C.char {
 	profile := C.GoStringN(profile_ptr, profile_len)
 	handle := C.GoStringN(handle_ptr, handle_len)
-	msg := C.GoStringN(msg_ptr, msg_len)
-	SendMessage(profile, handle, msg)
+	return C.CString(GetMessages(profile, handle, int(start), int(end)))
 }

-func SendMessage(profileOnion, handle, msg string) {
-	profile := application.GetPeer(profileOnion)
-	ph := utils.NewPeerHelper(profile)
-	if ph.IsGroup(handle) {
-		groupHandler, err := groups.ExperimentGate(utils.ReadGlobalSettings().Experiments)
-		if err == nil {
-			groupHandler.SendMessage(profile, handle, msg)
-		}
-	} else {
-		contactHandler, _ := contact.FunctionalityGate(utils.ReadGlobalSettings().Experiments)
-		contactHandler.SendMessage(profile, handle, msg)
-	}
-}
-
-//export c_SendInvitation
-func c_SendInvitation(profile_ptr *C.char, profile_len C.int, handle_ptr *C.char, handle_len C.int, target_ptr *C.char, target_len C.int) {
-	profile := C.GoStringN(profile_ptr, profile_len)
-	handle := C.GoStringN(handle_ptr, handle_len)
-	target := C.GoStringN(target_ptr, target_len)
-	SendInvitation(profile, handle, target)
-}
-
-// Send an invitation from `profileOnion` to contact `handle` (peer or group)
-// asking them to add the contact `target`  (also peer or group).
-// For groups, the profile must already have `target` as a contact.
-func SendInvitation(profileOnion, handle, target string) {
-	profile := application.GetPeer(profileOnion)
-	ph := utils.NewPeerHelper(profile)
-
-	var invite ChatMessage
-	if ph.IsGroup(target) {
-		bundle, _ := profile.GetContact(profile.GetGroup(target).GroupServer).GetAttribute(string(model.BundleType))
-		inviteStr, err := profile.GetGroup(target).Invite()
-		if err == nil {
-			invite = ChatMessage{O: 101, D: fmt.Sprintf("tofubundle:server:%s||%s", base64.StdEncoding.EncodeToString([]byte(bundle)), inviteStr)}
-		}
-	} else {
-		invite = ChatMessage{O: 100, D: target}
-	}
-
-	inviteBytes, err := json.Marshal(invite)
-	if err != nil {
-		log.Errorf("malformed invite: %v", err)
-	} else {
-		SendMessage(profileOnion, handle, string(inviteBytes))
-	}
-}
-
-//export c_ResetTor
-func c_ResetTor() {
-	ResetTor()
-}
-
-func ResetTor() {
-	globalACN.Restart()
-}
-
-//export c_CreateGroup
-func c_CreateGroup(profile_ptr *C.char, profile_len C.int, server_ptr *C.char, server_len C.int, name_ptr *C.char, name_len C.int) {
-	profile := C.GoStringN(profile_ptr, profile_len)
-	server := C.GoStringN(server_ptr, server_len)
-	name := C.GoStringN(name_ptr, name_len)
-	CreateGroup(profile, server, name)
-}
-
-// CreateGroup takes in a profile and server in addition to a name and creates a new group.
-func CreateGroup(profile string, server string, name string) {
-	peer := application.GetPeer(profile)
-	_, err := groups.ExperimentGate(utils.ReadGlobalSettings().Experiments)
-	if err == nil {
-		gid, _, err := peer.StartGroup(server)
-		if err == nil {
-			log.Debugf("created group %v on %v: $v", profile, server, gid)
-			// set the group name
-			peer.SetGroupAttribute(gid, attr.GetLocalScope("name"), name)
-		} else {
-			log.Errorf("error creating group or %v on server %v: %v", profile, server, err)
-		}
-	}
-}
-
-//export c_DeleteProfile
-func c_DeleteProfile(profile_ptr *C.char, profile_len C.int, password_ptr *C.char, password_len C.int) {
-	profile := C.GoStringN(profile_ptr, profile_len)
-	password := C.GoStringN(password_ptr, password_len)
-	DeleteProfile(profile, password)
-}
-
-// DeleteProfile deletes a profile given the right password
-func DeleteProfile(profile string, password string) {
-
-	// allow a blank password to delete "unencrypted" accounts...
-	if password == "" {
-		password = constants.DefactoPasswordForUnencryptedProfiles
-	}
-
-	application.DeletePeer(profile, password)
-}
-
-//export c_LeaveConversation
-func c_LeaveConversation(profile_ptr *C.char, profile_len C.int, contact_ptr *C.char, contact_len C.int) {
-	profile := C.GoStringN(profile_ptr, profile_len)
-	contact := C.GoStringN(contact_ptr, contact_len)
-	LeaveConversation(profile, contact)
-}
-
-// LeaveConversation forces profile to leave the peer
-func LeaveConversation(profile string, contact string) {
-	peer := application.GetPeer(profile)
-	peer.DeleteContact(contact)
-}
-
-//export c_LeaveGroup
-func c_LeaveGroup(profile_ptr *C.char, profile_len C.int, group_ptr *C.char, group_len C.int) {
-	profile := C.GoStringN(profile_ptr, profile_len)
-	groupID := C.GoStringN(group_ptr, group_len)
-	LeaveGroup(profile, groupID)
-}
-
-// LeaveGroup forces profile to leave the group groupID
-func LeaveGroup(profile string, groupID string) {
-	peer := application.GetPeer(profile)
-	_, err := groups.ExperimentGate(utils.ReadGlobalSettings().Experiments)
-	if err == nil {
-		peer.DeleteGroup(groupID)
-	}
-}
-
-//export c_ImportBundle
-func c_ImportBundle(profile_ptr *C.char, profile_len C.int, bundle_ptr *C.char, bundle_len C.int) {
-	profile := C.GoStringN(profile_ptr, profile_len)
-	name := C.GoStringN(bundle_ptr, bundle_len)
-	ImportBundle(profile, name)
-}
-
-// ImportBundle takes in a handle to a profile and an invite string which could have one of many
-// different formats (e.g. a peer address, a group invite, a server key bundle, or a combination)
-func ImportBundle(profileOnion string, bundle string) {
-	profile := application.GetPeer(profileOnion)
-	peerHandler, _ := contact.FunctionalityGate(utils.ReadGlobalSettings().Experiments)
-	response := peerHandler.HandleImportString(profile, bundle)
-	if strings.Contains(response.Error(), "invalid_import_string") {
-		groupHandler, err := groups.ExperimentGate(utils.ReadGlobalSettings().Experiments)
-		if err == nil {
-			response = groupHandler.HandleImportString(profile, bundle)
-			eventHandler.Push(event.NewEvent(event.AppError, map[event.Field]string{event.Data: response.Error()}))
-
-			// We might have added a new server, so refresh the server list...
-			serverListForOnion := groupHandler.GetServerInfoList(profile)
-			serversListBytes, _ := json.Marshal(serverListForOnion)
-			eventHandler.Push(event.NewEvent(groups.UpdateServerInfo, map[event.Field]string{"ProfileOnion": profileOnion, groups.ServerList: string(serversListBytes)}))
-			return
-		}
-	}
-	eventHandler.Push(event.NewEvent(event.AppError, map[event.Field]string{event.Data: response.Error()}))
-}
-
-//export c_SetGroupAttribute
-func c_SetGroupAttribute(profile_ptr *C.char, profile_len C.int, group_ptr *C.char, group_len C.int, key_ptr *C.char, key_len C.int, val_ptr *C.char, val_len C.int) {
-	profileOnion := C.GoStringN(profile_ptr, profile_len)
-	groupHandle := C.GoStringN(group_ptr, group_len)
-	key := C.GoStringN(key_ptr, key_len)
-	value := C.GoStringN(val_ptr, val_len)
-	SetGroupAttribute(profileOnion, groupHandle, key, value)
-}
-
-// SetGroupAttribute provides a wrapper around profile.SetGroupAttribute, gated by global experiments...
-func SetGroupAttribute(profileOnion string, groupHandle string, key string, value string) {
-	profile := application.GetPeer(profileOnion)
-	_, err := groups.ExperimentGate(utils.ReadGlobalSettings().Experiments)
-	if err == nil {
-		profile.SetGroupAttribute(groupHandle, key, value)
-	}
-}
-
-//export c_ShutdownCwtch
-func c_ShutdownCwtch() {
-	ShutdownCwtch()
-}
-
-// ShutdownCwtch is a safe way to shutdown any active cwtch applications and associated ACNs
-func ShutdownCwtch() {
-	if application != nil && globalACN != nil {
-		// Kill the isolate
-		eventHandler.Push(event.NewEvent(event.Shutdown, map[event.Field]string{}))
-
-		// Allow for the shutdown events to go through and then purge everything else...
-		log.Infof("Shutting Down Application...")
-		application.Shutdown()
-		log.Infof("Shutting Down ACN...")
-		globalACN.Close()
-		log.Infof("Library Shutdown Complete!")
-		// do not remove - important for state checks elsewhere
-		application = nil
-		globalACN = nil
-		eventHandler = nil
-	}
+func GetMessages(profile, handle string, start, end int) string {
+	messages := application.GetPeer(profile).GetContact(handle).Timeline.Messages[start:end]
+	bytes, _ := json.Marshal(messages)
+	return string(bytes)
 }

 // Leave as is, needed by ffi
--- a/utils/contacts.go
+++ b/utils/contacts.go
@ -1,15 +1,8 @@
 package utils

 type Contact struct {
-	Name          string `json:"name"`
-	Onion         string `json:"onion"`
-	Status        string `json:"status"`
-	Picture       string `json:"picture"`
-	Authorization string `json:"authorization"`
-	SaveHistory   string `json:"saveConversationHistory"`
-	Messages      int    `json:"numMessages"`
-	Unread        int    `json:"numUnread"`
-	LastMessage   string `json:"lastMsgTime"`
-	IsGroup       bool   `json:"isGroup"`
-	GroupServer   string `json:"groupServer"`
+	Name   string `json:"name"`
+	Onion  string `json:"onion"`
+	Status string `json:"status"`
+	Picture  string `json:"picture"`
 }
--- a/utils/eventHandler.go
+++ b/utils/eventHandler.go
@ -8,9 +8,7 @@ import (
 	"cwtch.im/cwtch/protocol/connections"
 	"encoding/json"
 	"git.openprivacy.ca/flutter/libcwtch-go/constants"
-	"git.openprivacy.ca/flutter/libcwtch-go/features/groups"
 	"git.openprivacy.ca/openprivacy/log"
-	"strconv"
 )
 import "cwtch.im/cwtch/event"

@ -23,31 +21,20 @@ type EventHandler struct {
 	app           app.Application
 	appBusQueue   event.Queue
 	profileEvents chan EventProfileEnvelope
+
+	profileQueues map[string]event.Queue
 }

-func NewEventHandler() *EventHandler {
-	eh := &EventHandler{app: nil, appBusQueue: event.NewQueue(), profileEvents: make(chan EventProfileEnvelope)}
-	return eh
-}
-
-// PublishAppEvent is a way for libCwtch-go to publish an event for consumption by a UI before a Cwtch app has been initialized
-//   Main use: to signal an error before a cwtch app could be created
-func (eh *EventHandler) PublishAppEvent(event event.Event) {
-	eh.appBusQueue.Publish(event)
-}
-
-func (eh *EventHandler) HandleApp(application app.Application) {
-	eh.app = application
-	application.GetPrimaryBus().Subscribe(event.NewPeer, eh.appBusQueue)
-	application.GetPrimaryBus().Subscribe(event.PeerError, eh.appBusQueue)
-	application.GetPrimaryBus().Subscribe(event.PeerDeleted, eh.appBusQueue)
-	application.GetPrimaryBus().Subscribe(event.Shutdown, eh.appBusQueue)
-	application.GetPrimaryBus().Subscribe(event.AppError, eh.appBusQueue)
-	application.GetPrimaryBus().Subscribe(event.ACNStatus, eh.appBusQueue)
-	application.GetPrimaryBus().Subscribe(event.ReloadDone, eh.appBusQueue)
-	application.GetPrimaryBus().Subscribe(event.ACNVersion, eh.appBusQueue)
-	application.GetPrimaryBus().Subscribe(UpdateGlobalSettings, eh.appBusQueue)
-	application.GetPrimaryBus().Subscribe(CwtchStarted, eh.appBusQueue)
+func NewEventHandler(application app.Application) *EventHandler {
+	appBusQueue := event.NewQueue()
+	application.GetPrimaryBus().Subscribe(event.NewPeer, appBusQueue)
+	application.GetPrimaryBus().Subscribe(event.PeerError, appBusQueue)
+	application.GetPrimaryBus().Subscribe(event.AppError, appBusQueue)
+	application.GetPrimaryBus().Subscribe(event.ACNStatus, appBusQueue)
+	application.GetPrimaryBus().Subscribe(event.ReloadDone, appBusQueue)
+	application.GetPrimaryBus().Subscribe(event.ACNVersion, appBusQueue)
+	application.GetPrimaryBus().Subscribe(UpdateGlobalSettings, appBusQueue)
+	return &EventHandler{app: application, appBusQueue: appBusQueue, profileQueues: make(map[string]event.Queue), profileEvents: make(chan EventProfileEnvelope)}
 }

 func (eh *EventHandler) GetNextEvent() string {
@ -63,164 +50,68 @@ func (eh *EventHandler) GetNextEvent() string {

 // handleAppBusEvent enriches AppBus events so they are usable with out further data fetches
 func (eh *EventHandler) handleAppBusEvent(e *event.Event) string {
-	log.Debugf("New AppBus Event to Handle: %v", e)
-	if eh.app != nil {
-		switch e.EventType {
-		case event.ACNStatus:
-			if e.Data[event.Progress] == "100" {
-				for onion := range eh.app.ListPeers() {
-					// launch a listen thread (internally this does a check that the protocol engine is not listening)
-					// and as such is safe to call.
-					eh.app.GetPeer(onion).Listen()
-				}
-			}
-		case event.NewPeer:
-			onion := e.Data[event.Identity]
-			profile := eh.app.GetPeer(e.Data[event.Identity])
-			log.Debug("New Peer Event: %v", e)
+	switch e.EventType {
+	case event.NewPeer:
+		onion := e.Data[event.Identity]
+		profile := eh.app.GetPeer(e.Data[event.Identity])

-			if e.Data["Reload"] != event.True {
-				eh.startHandlingPeer(onion)
-			}
+		eh.startHandlingPeer(onion)

-			tag,isTagged := profile.GetAttribute(app.AttributeTag)
-			if isTagged {
-				e.Data[app.AttributeTag] = tag
-			} else {
-				// Assume encrypted for non-tagged profiles - this isn't always true, but all post-beta profiles
-				// are tagged on creation.
-				e.Data[app.AttributeTag] = constants.ProfileTypeV1Password
-			}
-
-			if e.Data[event.Created] == event.True {
-				name, _ := profile.GetAttribute(attr.GetLocalScope(constants.Name))
-				profile.SetAttribute(attr.GetPublicScope(constants.Name), name)
-				profile.SetAttribute(attr.GetPublicScope(constants.Picture), ImageToString(NewImage(RandomProfileImage(onion), TypeImageDistro)))
-			}
-			if e.Data[event.Status] != event.StorageRunning || e.Data[event.Created] == event.True {
-				profile.SetAttribute(attr.GetLocalScope(constants.PeerOnline), event.False)
-				eh.app.AddPeerPlugin(onion, plugins.CONNECTIONRETRY)
-				eh.app.AddPeerPlugin(onion, plugins.NETWORKCHECK)
-
-				// If the user has chosen to block unknown profiles
-				// then explicitly configure the protocol engine to do so..
-				if ReadGlobalSettings().BlockUnknownConnections {
-					profile.BlockUnknownConnections()
-				} else {
-					// For completeness
-					profile.AllowUnknownConnections()
-				}
-
-				// Start up the Profile
-				profile.Listen()
-				profile.StartPeersConnections()
-				if _, err := groups.ExperimentGate(ReadGlobalSettings().Experiments); err == nil {
-					profile.StartServerConnections()
-				}
-			}
-
-			nick, exists := profile.GetAttribute(attr.GetPublicScope(constants.Name))
-			if !exists {
-				nick = onion
-			}
-
-			picVal, ok := profile.GetAttribute(attr.GetPublicScope(constants.Picture))
-			if !ok {
-				picVal = ImageToString(NewImage(RandomProfileImage(onion), TypeImageDistro))
-			}
-			pic, err := StringToImage(picVal)
-			if err != nil {
-				pic = NewImage(RandomProfileImage(onion), TypeImageDistro)
-			}
-			picPath := GetPicturePath(pic)
-
-			//tag, _ := profile.GetAttribute(app.AttributeTag)
-
-			online, _ := profile.GetAttribute(attr.GetLocalScope(constants.PeerOnline))
-
-			e.Data[constants.Name] = nick
-			e.Data[constants.Picture] = picPath
-			e.Data["Online"] = online
-
-			var contacts []Contact
-			var servers []groups.Server
-			for _, contact := range profile.GetContacts() {
-
-				// Only compile the server info if we have enabled the experiment...
-				// Note that this means that this info can become stale if when first loaded the experiment
-				// has been disabled and then is later re-enabled. As such we need to ensure that this list is
-				// re-fetched when the group experiment is enabled via a dedicated ListServerInfo event...
-				if profile.GetContact(contact).IsServer() {
-					groupHandler, err := groups.ExperimentGate(ReadGlobalSettings().Experiments)
-					if err == nil {
-						servers = append(servers, groupHandler.GetServerInfo(contact, profile))
-					}
-					continue
-				}
-
-				contactInfo := profile.GetContact(contact)
-				ph := NewPeerHelper(profile)
-				name := ph.GetNick(contact)
-				cpicPath := ph.GetProfilePic(contact)
-				saveHistory, set := contactInfo.GetAttribute(event.SaveHistoryKey)
-				if !set {
-					saveHistory = event.DeleteHistoryDefault
-				}
-				contacts = append(contacts, Contact{
-					Name:          name,
-					Onion:         contactInfo.Onion,
-					Status:        contactInfo.State,
-					Picture:       cpicPath,
-					Authorization: string(contactInfo.Authorization),
-					SaveHistory:   saveHistory,
-					Messages:      contactInfo.Timeline.Len(),
-					Unread:        0,
-					LastMessage:   strconv.Itoa(getLastMessageTime(&contactInfo.Timeline)),
-					IsGroup:       false,
-				})
-			}
-
-			// We compile and send the groups regardless of the experiment flag, and hide them in the UI
-			for _, groupId := range profile.GetGroups() {
-				group := profile.GetGroup(groupId)
-
-				// Check that the group is cryptographically valid
-				if !group.CheckGroup() {
-					continue
-				}
-
-				ph := NewPeerHelper(profile)
-				cpicPath := ph.GetProfilePic(groupId)
-
-				authorization := model.AuthUnknown
-				if group.Accepted {
-					authorization = model.AuthApproved
-				}
-
-				contacts = append(contacts, Contact{
-					Name:          ph.GetNick(groupId),
-					Onion:         group.GroupID,
-					Status:        group.State,
-					Picture:       cpicPath,
-					Authorization: string(authorization),
-					SaveHistory:   event.SaveHistoryConfirmed,
-					Messages:      group.Timeline.Len(),
-					Unread:        0,
-					LastMessage:   strconv.Itoa(getLastMessageTime(&group.Timeline)),
-					IsGroup:       true,
-					GroupServer:   group.GroupServer,
-				})
-			}
-
-			bytes, _ := json.Marshal(contacts)
-			e.Data["ContactsJson"] = string(bytes)
-
-			// Marshal the server list into the new peer event...
-			serversListBytes, _ := json.Marshal(servers)
-			e.Data[groups.ServerList] = string(serversListBytes)
-
-			log.Debugf("contactsJson %v", e.Data["ContactsJson"])
+		if e.Data[event.Created] == event.True {
+			profile.SetAttribute(attr.GetPublicScope(constants.Name), profile.GetName())
+			profile.SetAttribute(attr.GetPublicScope(constants.Picture), ImageToString(NewImage(RandomProfileImage(onion), TypeImageDistro)))
 		}
+		if e.Data[event.Status] != event.StorageRunning || e.Data[event.Created] == event.True {
+			profile.SetAttribute(attr.GetLocalScope(constants.PeerOnline), event.False)
+			eh.app.AddPeerPlugin(onion, plugins.CONNECTIONRETRY)
+			eh.app.AddPeerPlugin(onion, plugins.NETWORKCHECK)
+		}
+
+		nick, exists := profile.GetAttribute(attr.GetPublicScope(constants.Name))
+		if !exists {
+			nick = onion
+		}
+
+		picVal, ok := profile.GetAttribute(attr.GetPublicScope(constants.Picture))
+		if !ok {
+			picVal = ImageToString(NewImage(RandomProfileImage(onion), TypeImageDistro))
+		}
+		pic, err := StringToImage(picVal)
+		if err != nil {
+			pic = NewImage(RandomProfileImage(onion), TypeImageDistro)
+		}
+		picPath := GetPicturePath(pic)
+
+		//tag, _ := profile.GetAttribute(app.AttributeTag)
+
+		online, _ := profile.GetAttribute(attr.GetLocalScope(constants.PeerOnline))
+
+		e.Data[constants.Name] = nick
+		e.Data[constants.Picture] = picPath
+		e.Data["Online"] = online
+
+		var contacts []Contact
+		for _, contact := range profile.GetContacts() {
+			if profile.GetContact(contact).IsServer() {
+				continue
+			}
+
+			cpicVal, ok := profile.GetContactAttribute(contact, attr.GetPeerScope(constants.Picture))
+			if !ok {
+				cpicVal = ImageToString(NewImage(RandomProfileImage(contact), TypeImageDistro))
+			}
+			cpic, err := StringToImage(cpicVal)
+			if err != nil {
+				cpic = NewImage(RandomProfileImage(contact), TypeImageDistro)
+			}
+			cpicPath := GetPicturePath(cpic)
+			contactInfo := profile.GetContact(contact)
+			contacts = append(contacts, Contact{Name: contactInfo.Name, Onion: contactInfo.Onion, Status: contactInfo.State, Picture: cpicPath,})
+		}
+
+		bytes, _ := json.Marshal(contacts)
+		e.Data["ContactsJson"] = string(bytes)
+		log.Infof("contactsJson %v", e.Data["ContactsJson"])
 	}

 	json, _ := json.Marshal(e)
@ -229,123 +120,143 @@ func (eh *EventHandler) handleAppBusEvent(e *event.Event) string {

 // handleProfileEvent enriches Profile events so they are usable with out further data fetches
 func (eh *EventHandler) handleProfileEvent(ev *EventProfileEnvelope) string {
-	if eh.app == nil {
-		log.Errorf("eh.app == nil in handleProfileEvent... this shouldnt happen?")
-	} else {
-		peer := eh.app.GetPeer(ev.Profile)
-		ph := NewPeerHelper(peer)
-		log.Debugf("New Profile Event to Handle: %v", ev)
-		switch ev.Event.EventType {

-		/*
-				TODO: still handle this somewhere - network info from plugin Network check
-				case event.NetworkStatus:
-			online, _ := peer.GetAttribute(attr.GetLocalScope(constants.PeerOnline))
-			if e.Data[event.Status] == plugins.NetworkCheckSuccess && online == event.False {
-				peer.SetAttribute(attr.GetLocalScope(constants.PeerOnline), event.True)
-				uiManager.UpdateNetworkStatus(true)
-				// TODO we may have to reinitialize the peer
-			} else if e.Data[event.Status] == plugins.NetworkCheckError && online == event.True {
-				peer.SetAttribute(attr.GetLocalScope(constants.PeerOnline), event.False)
-				uiManager.UpdateNetworkStatus(false)
-			}*/
+	peer := eh.app.GetPeer(ev.Profile)
+	ph := NewPeerHelper(peer)

-		case event.NewMessageFromPeer: //event.TimestampReceived, event.RemotePeer, event.Data
-			// only needs contact nickname and picture, for displaying on popup notifications
-			ev.Event.Data["Nick"] = ph.GetNick(ev.Event.Data["RemotePeer"])
-			ev.Event.Data["Picture"] = ph.GetProfilePic(ev.Event.Data["RemotePeer"])
-		case event.NewMessageFromGroup:
-			// only needs contact nickname and picture, for displaying on popup notifications
-			ev.Event.Data["Nick"] = ph.GetNick(ev.Event.Data[event.GroupID])
-			ev.Event.Data["Picture"] = ph.GetProfilePic(ev.Event.Data[event.GroupID])
-		case event.PeerAcknowledgement:
-			// No enrichement required
-		case event.PeerCreated:
-			handle := ev.Event.Data[event.RemotePeer]
-			err := EnrichNewPeer(handle, ph, ev)
+	switch ev.Event.EventType {
+
+	/*case event.NetworkStatus:
+	online, _ := peer.GetAttribute(attr.GetLocalScope(constants.PeerOnline))
+	if e.Data[event.Status] == plugins.NetworkCheckSuccess && online == event.False {
+		peer.SetAttribute(attr.GetLocalScope(constants.PeerOnline), event.True)
+		uiManager.UpdateNetworkStatus(true)
+		// TODO we may have to reinitialize the peer
+	} else if e.Data[event.Status] == plugins.NetworkCheckError && online == event.True {
+		peer.SetAttribute(attr.GetLocalScope(constants.PeerOnline), event.False)
+		uiManager.UpdateNetworkStatus(false)
+	}*/
+
+	case event.NewMessageFromPeer: //event.TimestampReceived, event.RemotePeer, event.Data
+		// I Don't think we need to enrich
+
+		// TODO: deprecate and move to dart
+		/*func (p *PeerHelper) updateLastReadTime(id string) {
+		lastRead, _ := time.Now().MarshalText()
+		if p.IsGroup(id) {
+			p.peer.SetGroupAttribute(id, attr.GetLocalScope(constants.LastRead), string(lastRead))
+		} else {
+			p.peer.SetContactAttribute(id, attr.GetLocalScope(constants.LastRead), string(lastRead))
+		}
+		}*/
+
+		// legacy
+		//ts, _ := time.Parse(time.RFC3339Nano, e.Data[event.TimestampReceived])
+
+	case event.PeerAcknowledgement:
+		// No enrichement required
+		//Acknowledge(ev.Event.Data[event.RemotePeer], ev.Event.Data[event.EventID])
+	/*
+		case event.NewMessageFromGroup: //event.TimestampReceived, event.TimestampSent, event.Data, event.GroupID, event.RemotePeer
+			ts, _ := time.Parse(time.RFC3339Nano, e.Data[event.TimestampSent])
+			uiManager.AddMessage(e.Data[event.GroupID], e.Data[event.RemotePeer], e.Data[event.Data], e.Data[event.RemotePeer] == peer.GetOnion(), hex.EncodeToString([]byte(e.Data[event.Signature])), ts, true)
+
+		case event.NewGroupInvite:
+			gid, err := peer.ProcessInvite(e.Data[event.GroupInvite], e.Data[event.RemotePeer])
+			group := peer.GetGroup(gid)
+			if err == nil && group != nil {
+				uiManager.AddContact(gid)
+			}
+	*/
+	case event.PeerCreated:
+		handle := ev.Event.Data[event.RemotePeer]
+		err := EnrichNewPeer(handle, ph, ev)
+		if err != nil {
+			return ""
+		}
+	/*
+		case event.SendMessageToGroupError:
+			uiManager.AddSendMessageError(e.Data[event.GroupServer], e.Data[event.Signature], e.Data[event.Error])
+		case event.SendMessageToPeerError:
+			uiManager.AddSendMessageError(e.Data[event.RemotePeer], e.Data[event.EventID], e.Data[event.Error])
+	*/
+	case event.PeerStateChange:
+		cxnState := connections.ConnectionStateToType[ev.Event.Data[event.ConnectionState]]
+		contact := peer.GetContact(ev.Event.Data[event.RemotePeer])
+
+		if cxnState == connections.AUTHENTICATED && contact == nil {
+			// Contact does not exist, change event to NewPeer
+			peer.AddContact(ev.Event.Data[event.RemotePeer], ev.Event.Data[event.RemotePeer], model.AuthUnknown)
+			contact = peer.GetContact(ev.Event.Data[event.RemotePeer])
+			ev.Event.EventType = event.PeerCreated
+			err := EnrichNewPeer(ev.Event.Data[event.RemotePeer], ph, ev)
 			if err != nil {
 				return ""
 			}
-		case event.GroupCreated:
-			// This event should only happen after we have validated the invite, as such the error
-			// condition *should* never happen.
+		}

-			groupPic := ph.GetProfilePic(ev.Event.Data[event.GroupID])
-			ev.Event.Data["PicturePath"] = groupPic
-			ev.Event.Data["GroupName"] = ph.GetNick(ev.Event.Data[event.GroupID])
-
-		case event.NewGroup:
-			// This event should only happen after we have validated the invite, as such the error
-			// condition *should* never happen.
-			serializedInvite := ev.Event.Data[event.GroupInvite]
-			if invite, err := model.ValidateInvite(serializedInvite); err == nil {
-				groupPic := ph.GetProfilePic(invite.GroupID)
-				ev.Event.Data["PicturePath"] = groupPic
-			} else {
-				log.Errorf("received a new group event which contained an invalid invite %v. this should never happen and likely means there is a bug in cwtch. Please file a ticket @ https://git.openprivcy.ca/cwtch.im/cwtch", err)
-				return ""
-			}
-		case event.PeerStateChange:
-			cxnState := connections.ConnectionStateToType()[ev.Event.Data[event.ConnectionState]]
-			contact := peer.GetContact(ev.Event.Data[event.RemotePeer])
-
-			if cxnState == connections.AUTHENTICATED && contact == nil {
-				peer.AddContact(ev.Event.Data[event.RemotePeer], ev.Event.Data[event.RemotePeer], model.AuthUnknown)
-				return ""
-			}
-
-			if contact != nil {
-				// No enrichment needed
-				//uiManager.UpdateContactStatus(contact.Onion, int(cxnState), false)
-				if cxnState == connections.AUTHENTICATED {
-					// if known and authed, get vars
-					peer.SendGetValToPeer(ev.Event.Data[event.RemotePeer], attr.PublicScope, constants.Name)
-					peer.SendGetValToPeer(ev.Event.Data[event.RemotePeer], attr.PublicScope, constants.Picture)
-				}
-			}
-
-		case event.NewRetValMessageFromPeer:
-			// auto handled event means the setting is already done, we're just deciding if we need to tell the UI
-			onion := ev.Event.Data[event.RemotePeer]
-			scope := ev.Event.Data[event.Scope]
-			path := ev.Event.Data[event.Path]
-			//val := ev.Event.Data[event.Data]
-			exists, _ := strconv.ParseBool(ev.Event.Data[event.Exists])
-
-			if exists && scope == attr.PublicScope {
-				if _, exists := peer.GetContactAttribute(onion, attr.GetLocalScope(path)); exists {
-					// we have a locally set ovverride, don't pass this remote set public scope update to UI
-					return ""
-				}
+		if contact != nil {
+			// No enrichment needed
+			//uiManager.UpdateContactStatus(contact.Onion, int(cxnState), false)
+			if cxnState == connections.AUTHENTICATED {
+				// if known and authed, get vars
+				peer.SendGetValToPeer(ev.Event.Data[event.RemotePeer], attr.PublicScope, constants.Name)
+				peer.SendGetValToPeer(ev.Event.Data[event.RemotePeer], attr.PublicScope, constants.Picture)
 			}
 		}
+
+		/*case event.NewRetValMessageFromPeer:
+			onion := e.Data[event.RemotePeer]
+			scope := e.Data[event.Scope]
+			path := e.Data[event.Path]
+			val := e.Data[event.Data]
+			exists, _ := strconv.ParseBool(e.Data[event.Exists])
+
+			if exists && scope == attr.PublicScope {
+				switch path {
+				case constants.Name:
+					peer.SetContactAttribute(onion, attr.GetPeerScope(constants.Name), val)
+					uiManager.UpdateContactDisplayName(onion)
+				case constants.Picture:
+					peer.SetContactAttribute(onion, attr.GetPeerScope(constants.Picture), val)
+					uiManager.UpdateContactPicture(onion)
+				}
+			}
+
+		case event.ServerStateChange:
+			serverOnion := e.Data[event.GroupServer]
+			state := connections.ConnectionStateToType[e.Data[event.ConnectionState]]
+			groups := peer.GetGroups()
+			for _, groupID := range groups {
+				group := peer.GetGroup(groupID)
+				if group != nil && group.GroupServer == serverOnion {
+					group.State = e.Data[event.ConnectionState]
+					loading := false
+					if state == connections.AUTHENTICATED {
+						loading = true
+					}
+					uiManager.UpdateContactStatus(groupID, int(state), loading)
+					uiManager.UpdateContactStatus(serverOnion, int(state), loading)
+				}
+			}
+		case event.DeletePeer:
+			log.Infof("PeerHandler got DeletePeer, SHUTTING down!\n")
+			uiManager.ReloadProfiles()
+			return
+		*/
 	}

-	json, _ := json.Marshal(unwrap(ev))
+	json, _ := json.Marshal(ev)
 	return string(json)
 }

-func unwrap(original *EventProfileEnvelope) *event.Event {
-	unwrapped := &original.Event
-	unwrapped.Data["ProfileOnion"] = original.Profile
-	return unwrapped
-}
-
 func (eh *EventHandler) startHandlingPeer(onion string) {
 	eventBus := eh.app.GetEventBus(onion)
 	q := event.NewQueue()
 	eventBus.Subscribe(event.NewMessageFromPeer, q)
 	eventBus.Subscribe(event.PeerAcknowledgement, q)
-	eventBus.Subscribe(event.DeleteContact, q)
-	eventBus.Subscribe(event.AppError, q)
-	eventBus.Subscribe(event.IndexedAcknowledgement, q)
-	eventBus.Subscribe(event.IndexedFailure, q)
 	eventBus.Subscribe(event.NewMessageFromGroup, q)
-	eventBus.Subscribe(event.GroupCreated, q)
-	eventBus.Subscribe(event.NewGroup, q)
-	eventBus.Subscribe(event.AcceptGroupInvite, q)
-	eventBus.Subscribe(event.SetGroupAttribute, q)
-	eventBus.Subscribe(event.DeleteGroup, q)
+	eventBus.Subscribe(event.NewGroupInvite, q)
 	eventBus.Subscribe(event.SendMessageToGroupError, q)
 	eventBus.Subscribe(event.SendMessageToPeerError, q)
 	eventBus.Subscribe(event.ServerStateChange, q)
@ -355,25 +266,18 @@ func (eh *EventHandler) startHandlingPeer(onion string) {
 	eventBus.Subscribe(event.ChangePasswordSuccess, q)
 	eventBus.Subscribe(event.ChangePasswordError, q)
 	eventBus.Subscribe(event.NewRetValMessageFromPeer, q)
-	eventBus.Subscribe(event.SetAttribute, q)
+
+	eh.profileQueues[onion] = q

 	go eh.forwardProfileMessages(onion, q)

 }

 func (eh *EventHandler) forwardProfileMessages(onion string, q event.Queue) {
-	log.Infof("Launching Forwarding Goroutine for %v", onion)
 	// TODO: graceful shutdown, via an injected event of special QUIT type exiting loop/go routine
 	for {
 		e := q.Next()
-		ev := EventProfileEnvelope{Event: e, Profile: onion}
+		ev := EventProfileEnvelope{Event: *e, Profile: onion}
 		eh.profileEvents <- ev
-		if ev.Event.EventType == event.Shutdown {
-			return
-		}
 	}
 }
-
-func (eh *EventHandler) Push(newEvent event.Event) {
-	eh.appBusQueue.Publish(newEvent)
-}
--- a/utils/logging.go
+++ b/utils/logging.go
@ -1,18 +0,0 @@
-package utils
-
-import "cwtch.im/cwtch/event"
-
-// An event to set the logging level dynamically from the UI
-const (
-	SetLoggingLevel = event.Type("SetLoggingLevel")
-)
-
-// Logging Levels as Event Fields. Note: Unlike most event we don't cae about
-// the *value* of the field, only the presence. If more than one of these fields is
-// present in a single SetLoggingLevel event then the highest logging level is used. INFO < WARN < ERROR < DEBUG
-const (
-	Warn  = event.Field("Warn")
-	Error = event.Field("Error")
-	Debug = event.Field("Debug")
-	Info  = event.Field("Info")
-)
--- a/utils/manager.go
+++ b/utils/manager.go
@ -87,8 +87,6 @@ func (p *PeerHelper) GetNick(id string) string {
 			nick, exists = p.peer.GetContactAttribute(id, attr.GetPeerScope(constants.Name))
 			if !exists {
 				nick = "[" + id + "]"
-				// re-request
-				p.peer.SendGetValToPeer(id, attr.PublicScope, constants.Name)
 			}
 		}
 		return nick
@ -247,7 +245,6 @@ func NewManager(profile string, gcd *GrandCentralDispatcher) Manager {
 //   uiManager.AddContact(onion)
 //   (handle string, displayName string, image string, badge int, status int, authorization string, loading bool, lastMsgTime int)
 func EnrichNewPeer(handle string, ph *PeerHelper, ev *EventProfileEnvelope) error {
-	log.Infof("Enriching New Peer %v", handle)
 	if ph.IsGroup(handle) {
 		group := ph.peer.GetGroup(handle)
 		if group != nil {
@ -256,7 +253,7 @@ func EnrichNewPeer(handle string, ph *PeerHelper, ev *EventProfileEnvelope) erro
 			ev.Event.Data["picture"] = ph.GetProfilePic(handle)

 			ev.Event.Data["nick"] = ph.GetNick(handle)
-			ev.Event.Data["status"] = strconv.Itoa(int(connections.ConnectionStateToType()[group.State]))
+			ev.Event.Data["status"] = strconv.Itoa(int(connections.ConnectionStateToType[group.State]))
 			ev.Event.Data["authorization"] = string(model.AuthApproved)
 			ev.Event.Data["loading"] = "false"
 			ev.Event.Data["lastMsgTime"] = strconv.Itoa(getLastMessageTime(&group.Timeline))
@ -266,28 +263,19 @@ func EnrichNewPeer(handle string, ph *PeerHelper, ev *EventProfileEnvelope) erro
 		if contact != nil {
 			lastRead := ph.InitLastReadTime(contact.Onion)
 			ev.Event.Data["unread"] = strconv.Itoa(ph.CountUnread(contact.Timeline.GetMessages(), lastRead))
-			ev.Event.Data["numMessages"] = strconv.Itoa(contact.Timeline.Len())
 			ev.Event.Data["picture"] = ph.GetProfilePic(handle)

 			ev.Event.Data["nick"] = ph.GetNick(handle)
+			ev.Event.Data["status"] = strconv.Itoa(int(connections.ConnectionStateToType[contact.State]))

-			// TODO Replace this if with a better flow that separates New Contacts and Peering Updates
-			if contact.State == "" {
-				// Will be disconnected to start
-				ev.Event.Data["status"] = connections.ConnectionStateName[connections.DISCONNECTED]
-			} else {
-				ev.Event.Data["status"] = contact.State
-			}
 			ev.Event.Data["authorization"] = string(contact.Authorization)
 			ev.Event.Data["loading"] = "false"
 			ev.Event.Data["lastMsgTime"] = strconv.Itoa(getLastMessageTime(&contact.Timeline))
-		} else {
-			log.Errorf("Failed to find contact: %v", handle)
 		}
 	} else {
 		// could be a server?
-		log.Debugf("sorry, unable to handle AddContact(%v)", handle)
-		return errors.New("not a peer or group")
+		log.Errorf("sorry, unable to handle AddContact(%v)", handle)
+		return errors.New("Not a peer or group")
 	}
 	return nil
 }
--- a/utils/settings.go
+++ b/utils/settings.go
@ -12,8 +12,6 @@ import (
 )

 const (
-	CwtchStarted         = event.Type("CwtchStarted")
-	CwtchStartError      = event.Type("CwtchStartError")
 	UpdateGlobalSettings = event.Type("UpdateGlobalSettings")
 )

@ -23,46 +21,37 @@ const GlobalSettingsFilename = "ui.globals"
 const saltFile = "SALT"

 type GlobalSettings struct {
-	Locale                  string
-	Theme                   string
-	PreviousPid             int64
-	ExperimentsEnabled      bool
-	Experiments             map[string]bool
-	BlockUnknownConnections bool
-	StateRootPane           int
-	FirstTime               bool
-	UIColumnModePortrait    string
-	UIColumnModeLandscape   string
+	Locale             string
+	Theme              string
+	PreviousPid        int64
+	ExperimentsEnabled bool
+	Experiments        map[string]bool
+	StateRootPane      int
+	FirstTime          bool
 }

 var DefaultGlobalSettings = GlobalSettings{
-	Locale:                  "en",
-	Theme:                   "dark",
-	PreviousPid:             -1,
-	ExperimentsEnabled:      false,
-	Experiments:             make(map[string]bool),
-	StateRootPane:           0,
-	FirstTime:               true,
-	BlockUnknownConnections: false,
-	UIColumnModePortrait:   "DualpaneMode.Single",
-	UIColumnModeLandscape:    "DualpaneMode.CopyPortrait",
+	Locale:             "en",
+	Theme:              "light",
+	PreviousPid:        -1,
+	ExperimentsEnabled: false,
+	Experiments:        make(map[string]bool),
+	StateRootPane:      0,
+	FirstTime:          true,
 }

 func InitGlobalSettingsFile(directory string, password string) error {
 	var key [32]byte
 	salt, err := ioutil.ReadFile(path.Join(directory, saltFile))
 	if err != nil {
-		log.Infof("Could not find salt file: %v (creating a new settings file)", err)
 		var newSalt [128]byte
 		key, newSalt, err = v1.CreateKeySalt(password)
 		if err != nil {
-			log.Errorf("Could not initialize salt: %v", err)
 			return err
 		}
 		os.Mkdir(directory, 0700)
 		err := ioutil.WriteFile(path.Join(directory, saltFile), newSalt[:], 0600)
 		if err != nil {
-			log.Errorf("Could not write salt file: %v", err)
 			return err
 		}
 	} else {
@ -70,28 +59,21 @@ func InitGlobalSettingsFile(directory string, password string) error {
 	}

 	GlobalSettingsFile = v1.NewFileStore(directory, GlobalSettingsFilename, key)
-	log.Infof("initialized global settings file: %v", GlobalSettingsFile)
 	return nil
 }

 func ReadGlobalSettings() *GlobalSettings {
 	settings := DefaultGlobalSettings

-	if GlobalSettingsFile == nil {
-		log.Errorf("Global Settings File was not Initialized Properly")
-		return &settings
-	}
-
 	settingsBytes, err := GlobalSettingsFile.Read()
 	if err != nil {
-		log.Infof("Could not read global ui settings: %v (assuming this is a first time app deployment...)", err)
+		log.Errorf("Could not read global ui settings: %v\n", err)
 		return &settings //firstTime = true
 	}

 	err = json.Unmarshal(settingsBytes, &settings)
 	if err != nil {
 		log.Errorf("Could not parse global ui settings: %v\n", err)
-		// TODO if settings is corrupted, we probably want to alert the UI.
 		return &settings //firstTime = true
 	}