diff --git a/internal/pocsag/pocsag.go b/internal/pocsag/pocsag.go
index 5b90828..f2716a2 100644
--- a/internal/pocsag/pocsag.go
+++ b/internal/pocsag/pocsag.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/dhogborg/go-pocsag/internal/datatypes"
 	"github.com/dhogborg/go-pocsag/internal/utils"
@@ -36,14 +37,14 @@ const (
 
 // ParsePOCSAG takes bits decoded from the stream and parses them for
 // batches of codewords then prints them using the specefied message type.
-func ParsePOCSAG(bits []datatypes.Bit, messagetype MessageType) {
+func ParsePOCSAG(bits []datatypes.Bit, messagetype MessageType) []*Message {
 
 	pocsag := &POCSAG{}
 
 	batches, err := pocsag.ParseBatches(bits)
 	if err != nil {
 		println(err.Error())
-		return
+		return []*Message{}
 	}
 
 	if DEBUG && LEVEL > 1 {
@@ -54,22 +55,7 @@ func ParsePOCSAG(bits []datatypes.Bit, messagetype MessageType) {
 		}
 	}
 
-	messages := pocsag.ParseMessages(batches)
-	for _, m := range messages {
-
-		green.Println("-- Message --------------")
-		green.Println("Reciptient: ", m.ReciptientString())
-
-		if !m.IsValid() {
-			red.Println("This message has parity check errors. Contents might be corrupted")
-		}
-
-		println("")
-		print(m.PayloadString(messagetype))
-		println("")
-		println("")
-
-	}
+	return pocsag.ParseMessages(batches)
 }
 
 type POCSAG struct{}
@@ -174,6 +160,7 @@ func (p *POCSAG) ParseMessages(batches []*Batch) []*Message {
 // Message construct holds refernces to codewords.
 // The Payload is a seies of codewords of message type.
 type Message struct {
+	Timestamp  time.Time
 	Reciptient *Codeword
 	Payload    []*Codeword
 }
@@ -181,11 +168,49 @@ type Message struct {
 // NewMessage creates a new message construct ready to accept payload codewords
 func NewMessage(reciptient *Codeword) *Message {
 	return &Message{
+		Timestamp:  time.Now(),
 		Reciptient: reciptient,
 		Payload:    []*Codeword{},
 	}
 }
 
+func (m *Message) Print(messagetype MessageType) {
+	green.Println("-- Message --------------")
+	green.Println("Reciptient: ", m.ReciptientString())
+
+	if !m.IsValid() {
+		red.Println("This message has parity check errors. Contents might be corrupted")
+	}
+
+	println("")
+	print(m.PayloadString(messagetype))
+	println("")
+	println("")
+
+}
+
+func (m *Message) Write(path string, messagetype MessageType) {
+	if !os.IsPathSeparator(path[len(path)-1]) {
+		path += "/"
+	}
+
+	now := time.Now()
+	timestr := now.Format("20060102_15.04.05")
+	file, err := os.Create(path + m.ReciptientString() + "_" + timestr + ".txt")
+	defer file.Close()
+
+	if err != nil {
+		println("error creating file: " + err.Error())
+		return
+	}
+
+	file.WriteString("Time: " + now.String() + "\n")
+	file.WriteString("Reciptient: " + m.ReciptientString() + "\n")
+	file.WriteString("-------------------\n")
+	file.WriteString(m.PayloadString(messagetype) + "\n")
+
+}
+
 // AddPayload codeword to a message. Must be codeword of CodewordTypeMessage type
 // to make sense.
 func (m *Message) AddPayload(codeword *Codeword) {
@@ -199,9 +224,9 @@ func (m *Message) ReciptientString() string {
 	addr := uint(bytes[1])
 	addr += uint(bytes[0]) << 8
 
-	return fmt.Sprintf("%X:%s%s", addr,
-		utils.TernaryStr(bool(m.Reciptient.Payload[18]), "1", "0"),
-		utils.TernaryStr(bool(m.Reciptient.Payload[19]), "1", "0"))
+	return fmt.Sprintf("%X%d%d", addr,
+		m.Reciptient.Payload[18].Int(),
+		m.Reciptient.Payload[19].Int())
 }
 
 // IsValid returns true if no parity bit check errors occurs in the message payload
diff --git a/main.go b/main.go
index 61e01f0..018b933 100644
--- a/main.go
+++ b/main.go
@@ -24,6 +24,7 @@ var (
 
 type Config struct {
 	input       string
+	output      string
 	baud        int
 	debug       bool
 	messagetype pocsag.MessageType
@@ -42,6 +43,11 @@ func main() {
 			Value: "",
 			Usage: "wav file with signed 16 bit ints, - for sttdin",
 		},
+		cli.StringFlag{
+			Name:  "output,o",
+			Value: "",
+			Usage: "Output decoded messages to a folder",
+		},
 		cli.IntFlag{
 			Name:  "verbosity",
 			Value: 0,
@@ -66,6 +72,7 @@ func main() {
 	app.Action = func(c *cli.Context) {
 		config = &Config{
 			input:       c.String("input"),
+			output:      c.String("output"),
 			baud:        c.Int("baud"),
 			debug:       c.Bool("debug"),
 			verbosity:   c.Int("verbosity"),
@@ -104,6 +111,15 @@ func Run() {
 
 	for {
 		bits := <-bitstream
-		pocsag.ParsePOCSAG(bits, config.messagetype)
+		messages := pocsag.ParsePOCSAG(bits, config.messagetype)
+
+		for _, m := range messages {
+			m.Print(config.messagetype)
+
+			if config.output != "" {
+				m.Write(config.output, config.messagetype)
+			}
+		}
+
 	}
 }