diff --git a/main.go b/main.go
index a194139..6e130f2 100644
--- a/main.go
+++ b/main.go
@@ -2,25 +2,39 @@
 package main
 
 import (
-	"fmt"
 	"log"
+	"fmt"
 	"os"
 
 	"github.com/o3ma/o3"
 )
 
-func main() {
 
+func main() {
 	var (
-		pass    = []byte{0xA, 0xB, 0xC, 0xD, 0xE}
-		tr      o3.ThreemaRest
+		pass    = []byte{0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37} // 01234567
 		idpath  = "threema.id"
 		abpath  = "address.book"
-		tid     o3.ThreemaID
+		gdpath  = "group.directory"
 		pubnick = "parrot"
-		rid     = "ZX9TZZ7P"
+		rid     = "ZX9TZZ7P" // e.g. ZX9TZZ7P
+		testMsg = "Say something!"
 	)
 
+	tr, tid, ctx, receiveMsgChan, sendMsgChan := initialise(pass, idpath, abpath, gdpath, pubnick)
+
+	go sendTestMsg(tr, abpath, rid, testMsg, ctx, sendMsgChan)
+
+	receiveLoop(tid, gdpath, ctx, receiveMsgChan, sendMsgChan)
+}
+
+
+func initialise(pass []byte, idpath string, abpath string, gdpath string, pubnick string) (*o3.ThreemaRest, *o3.ThreemaID, *o3.SessionContext, <-chan o3.ReceivedMsg, chan<- o3.Message) {
+		var (
+			tr      o3.ThreemaRest
+			tid     o3.ThreemaID
+		)
+
 	// check whether an id file exists or else create a new one
 	if _, err := os.Stat(idpath); err != nil {
 		var err error
@@ -51,13 +65,35 @@ func main() {
 	//check if we can load an addressbook
 	if _, err := os.Stat(abpath); !os.IsNotExist(err) {
 		fmt.Printf("Loading addressbook from %s\n", abpath)
-		err = ctx.ID.Contacts.ImportFrom(abpath)
+		err = ctx.ID.Contacts.LoadFromFile(abpath)
 		if err != nil {
 			fmt.Println("loading addressbook failed")
 			log.Fatal(err)
 		}
 	}
 
+	//check if we can load a group directory
+	if _, err := os.Stat(gdpath); !os.IsNotExist(err) {
+		fmt.Printf("Loading group directory from %s\n", gdpath)
+		err = ctx.ID.Groups.LoadFromFile(gdpath)
+		if err != nil {
+			fmt.Println("loading group directory failed")
+			log.Fatal(err)
+		}
+	}
+
+	// let the session begin
+	fmt.Println("Starting session")
+	sendMsgChan, receiveMsgChan, err := ctx.Run()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return &tr, &tid, &ctx, receiveMsgChan, sendMsgChan
+}
+
+
+func sendTestMsg(tr *o3.ThreemaRest, abpath string, rid string, testMsg string, ctx *o3.SessionContext, sendMsgChan chan<- o3.Message) {
 	// check if we know the remote ID for
 	// (just demonstration purposes \bc sending and receiving functions do this lookup for us)
 	if _, b := ctx.ID.Contacts.Get(rid); b == false {
@@ -80,19 +116,16 @@ func main() {
 		}
 	}
 
-	// let the session begin
-	fmt.Println("Starting session")
-	sendMsgChan, receiveMsgChan, err := ctx.Run()
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	// send our initial message to our recipient
-	fmt.Println("Sending initial message")
-	err = ctx.SendTextMessage(rid, "Say something!", sendMsgChan)
+	err, tm := ctx.SendTextMessage(rid, testMsg, sendMsgChan)
+	fmt.Println("Sending initial message [" + fmt.Sprintf("%x", tm.ID()) + "] to " + rid + ": " + testMsg + "\n--------------------\n")
 	if err != nil {
 		log.Fatal(err)
 	}
+}
+
+
+func receiveLoop(tid *o3.ThreemaID, gdpath string, ctx *o3.SessionContext, receiveMsgChan <-chan o3.ReceivedMsg, sendMsgChan chan<- o3.Message) {
 
 	// handle incoming messages
 	for receivedMessage := range receiveMsgChan {
@@ -107,6 +140,7 @@ func main() {
 			// play the audio if you like
 		case o3.TextMessage:
 			// respond with a quote of what was send to us.
+			fmt.Printf("\nMessage from %s: %s\n--------------------\n\n", msg.Sender(), msg.Text())
 			
 			// but only if it's no a message we sent to ourselves, avoid recursive neverending qoutes
 			if (tid.String() == msg.Sender().String()) {
@@ -117,29 +151,37 @@ func main() {
 			// of the form "> PERSONWEQUOTE: Text of qoute\nSomething we wanna add."
 			qoute := fmt.Sprintf("> %s: %s\n%s", msg.Sender(), msg.Text(), "Exactly!")
 			// we use the convinient "SendTextMessage" function to send
-			err = ctx.SendTextMessage(msg.Sender().String(), qoute, sendMsgChan)
+			err, _ := ctx.SendTextMessage(msg.Sender().String(), qoute, sendMsgChan)
 			if err != nil {
 				log.Fatal(err)
 			}
 			// confirm to the sender that we received the message
 			// this is how one can send messages manually without helper functions like "SendTextMessage"
-			drm, err := o3.NewDeliveryReceiptMessage(&ctx, msg.Sender().String(), msg.ID(), o3.MSGDELIVERED)
+			drm, err := o3.NewDeliveryReceiptMessage(ctx, msg.Sender().String(), msg.ID(), o3.MSGDELIVERED)
 			if err != nil {
 				log.Fatal(err)
 			}
 			sendMsgChan <- drm
 			// give a thumbs up
-			upm, err := o3.NewDeliveryReceiptMessage(&ctx, msg.Sender().String(), msg.ID(), o3.MSGAPPROVED)
+			upm, err := o3.NewDeliveryReceiptMessage(ctx, msg.Sender().String(), msg.ID(), o3.MSGAPPROVED)
 			if err != nil {
 				log.Fatal(err)
 			}
 			sendMsgChan <- upm
 		case o3.GroupTextMessage:
 			fmt.Printf("%s for Group [%x] created by [%s]:\n%s\n", msg.Sender(), msg.GroupID(), msg.GroupCreator(), msg.Text())
+			group, ok := ctx.ID.Groups.Get(msg.GroupCreator(), msg.GroupID())
+			if ok {
+				ctx.SendGroupTextMessage(group, "This is a group reply!", sendMsgChan)
+			}
 		case o3.GroupManageSetNameMessage:
 			fmt.Printf("Group [%x] is now called %s\n", msg.GroupID(), msg.Name())
+			ctx.ID.Groups.Upsert(o3.Group{CreatorID: msg.Sender(), GroupID: msg.GroupID(), Name: msg.Name()})
+			ctx.ID.Groups.SaveToFile(gdpath)
 		case o3.GroupManageSetMembersMessage:
 			fmt.Printf("Group [%x] now includes %v\n", msg.GroupID(), msg.Members())
+			ctx.ID.Groups.Upsert(o3.Group{CreatorID: msg.Sender(), GroupID: msg.GroupID(), Members: msg.Members()})
+			ctx.ID.Groups.SaveToFile(gdpath)
 		case o3.GroupMemberLeftMessage:
 			fmt.Printf("Member [%s] left the Group [%x]\n", msg.Sender(), msg.GroupID())
 		case o3.DeliveryReceiptMessage:
@@ -150,5 +192,4 @@ func main() {
 			fmt.Printf("Unknown message type from: %s\nContent: %#v", msg.Sender(), msg)
 		}
 	}
-
 }