diff --git a/app/inbucket/datastore.go b/app/inbucket/datastore.go
index c8eaf56..61f9b77 100644
--- a/app/inbucket/datastore.go
+++ b/app/inbucket/datastore.go
@@ -2,15 +2,19 @@ package inbucket
 
 import (
 	"bufio"
+	"encoding/gob"
+	"errors"
 	"fmt"
 	"github.com/robfig/revel"
+	"io/ioutil"
+	"net/mail"
 	"os"
 	"path/filepath"
-	"errors"
+	"strings"
 	"time"
 )
 
-var ErrNotWritable = errors.New("MailObject not writable")
+var ErrNotWritable = errors.New("Message not writable")
 
 // Global because we only want one regardless of the number of DataStore objects
 var countChannel = make(chan int, 10)
@@ -27,11 +31,15 @@ func countGenerator(c chan int) {
 	}
 }
 
+// A DataStore is the root of the mail storage hiearchy.  It provides access to
+// Mailbox objects
 type DataStore struct {
 	path     string
 	mailPath string
 }
 
+// NewDataStore creates a new DataStore object.  It uses the Revel Config object to
+// construct it's path.
 func NewDataStore() *DataStore {
 	path, found := rev.Config.String("datastore.path")
 	if found {
@@ -42,43 +50,103 @@ func NewDataStore() *DataStore {
 	return nil
 }
 
-type MailObject struct {
-	store      *DataStore
-	mailbox    string
-	rawPath    string
-	gobPath    string
+// Retrieves the Mailbox object for a specified email address, if the mailbox
+// does not exist, it will attempt to create it.
+func (ds *DataStore) MailboxFor(emailAddress string) (*Mailbox, error) {
+	name := ParseMailboxName(emailAddress)
+	dir := HashMailboxName(name)
+	path := filepath.Join(ds.mailPath, dir)
+	if err := os.MkdirAll(path, 0770); err != nil {
+		rev.ERROR.Printf("Failed to create directory %v, %v", path, err)
+		return nil, err
+	}
+	return &Mailbox{store: ds, name: name, dirName: dir, path: path}, nil
+}
+
+// A Mailbox manages the mail for a specific user and correlates to a particular
+// directory on disk.
+type Mailbox struct {
+	store   *DataStore
+	name    string
+	dirName string
+	path    string
+}
+
+func (mb *Mailbox) String() string {
+	return mb.name + "[" + mb.dirName + "]"
+}
+
+func (mb *Mailbox) GetMessages() ([]*Message, error) {
+	files, err := ioutil.ReadDir(mb.path)
+	if err != nil {
+		return nil, err
+	}
+	// This is twice the size it needs to be, oh darn
+	messages := make([]*Message, len(files))
+	for _, f := range files {
+		if (!f.IsDir()) && strings.HasSuffix(strings.ToLower(f.Name()), ".gob") {
+			// TODO: implement
+		}
+	}
+	return messages, nil
+}
+
+// Message contains a little bit of data about a particular email message, and
+// methods to retrieve the rest of it from disk.
+type Message struct {
+	mailbox *Mailbox
+	Id      string
+	Date    time.Time
+	From    string
+	Subject string
+	// These are for creating new messages only
 	writable   bool
 	writerFile *os.File
 	writer     *bufio.Writer
 }
 
-func (ds *DataStore) NewMailObject(emailAddress string) *MailObject {
-	mailbox := ParseMailboxName(emailAddress)
-	maildir := HashMailboxName(mailbox)
-	fileBase := time.Now().Format("20060102T150405") + "-" + fmt.Sprintf("%04d", <-countChannel)
-	boxPath := filepath.Join(ds.mailPath, maildir)
-	if err := os.MkdirAll(boxPath, 0770); err != nil {
-		rev.ERROR.Printf("Failed to create directory %v, %v", boxPath, err)
-		return nil
+// NewMessage creates a new Message object and sets the Date and Id fields.
+func (mb *Mailbox) NewMessage() *Message {
+	date := time.Now()
+	id := date.Format("20060102T150405") + "-" + fmt.Sprintf("%04d", <-countChannel)
+
+	return &Message{mailbox: mb, Id: id, Date: date, writable: true}
+}
+
+func (m *Message) String() string {
+	return fmt.Sprintf("\"%v\" from %v", m.Subject, m.From)
+}
+
+func (m *Message) gobPath() string {
+	return filepath.Join(m.mailbox.path, m.Id+".gob")
+}
+
+func (m *Message) rawPath() string {
+	return filepath.Join(m.mailbox.path, m.Id+".raw")
+}
+
+// ReadHeader opens the .raw portion of a Message and returns a standard Go mail.Message object
+func (m *Message) ReadHeader() (msg *mail.Message, err error) {
+	file, err := os.Open(m.rawPath())
+	defer file.Close()
+	if err != nil {
+		return nil, err
 	}
-	pathBase := filepath.Join(boxPath, fileBase)
-
-	return &MailObject{store: ds, mailbox: mailbox, rawPath: pathBase + ".raw",
-		gobPath: pathBase + ".gob", writable: true}
+	reader := bufio.NewReader(file)
+	msg, err = mail.ReadMessage(reader)
+	return msg, err
 }
 
-func (m *MailObject) Mailbox() string {
-	return m.mailbox
-}
-
-func (m *MailObject) Append(data []byte) error {
-	// Prevent Appending to a pre-existing MailObject
+// Append data to a newly opened Message, this will fail on a pre-existing Message and
+// after Close() is called.
+func (m *Message) Append(data []byte) error {
+	// Prevent Appending to a pre-existing Message
 	if !m.writable {
 		return ErrNotWritable
 	}
 	// Open file for writing if we haven't yet
 	if m.writer == nil {
-		file, err := os.Create(m.rawPath)
+		file, err := os.Create(m.rawPath())
 		if err != nil {
 			// Set writable false just in case something calls me a million times
 			m.writable = false
@@ -91,23 +159,56 @@ func (m *MailObject) Append(data []byte) error {
 	return err
 }
 
-func (m *MailObject) Close() error {
-	// nil out the fields so they can't be used
+// Close this Message for writing - no more data may be Appended.  Close() will also
+// trigger the creation of the .gob file.
+func (m *Message) Close() error {
+	// nil out the writer fields so they can't be used
 	writer := m.writer
 	writerFile := m.writerFile
 	m.writer = nil
 	m.writerFile = nil
 
-	if (writer != nil) {
+	if writer != nil {
 		if err := writer.Flush(); err != nil {
 			return err
 		}
 	}
-	if (writerFile != nil) {
+	if writerFile != nil {
 		if err := writerFile.Close(); err != nil {
 			return err
 		}
 	}
 
+	return m.createGob()
+}
+
+// createGob reads the .raw file to grab the From and Subject header entries,
+// then creates the .gob file.
+func (m *Message) createGob() error {
+	// Open gob for writing
+	file, err := os.Create(m.gobPath())
+	defer file.Close()
+	if err != nil {
+		return err
+	}
+	writer := bufio.NewWriter(file)
+
+	// Fetch headers
+	msg, err := m.ReadHeader()
+	if err != nil {
+		return err
+	}
+
+	// Only public fields are stored in gob
+	m.From = msg.Header.Get("From")
+	m.Subject = msg.Header.Get("Subject")
+
+	// Write & flush
+	enc := gob.NewEncoder(writer)
+	err = enc.Encode(m)
+	if err != nil {
+		return err
+	}
+	writer.Flush()
 	return nil
 }
diff --git a/app/smtpd/handler.go b/app/smtpd/handler.go
index 1bbab30..7073ec7 100644
--- a/app/smtpd/handler.go
+++ b/app/smtpd/handler.go
@@ -4,10 +4,10 @@ import (
 	"bufio"
 	"container/list"
 	"fmt"
+	"github.com/jhillyerd/inbucket/app/inbucket"
 	"net"
 	"strings"
 	"time"
-	"github.com/jhillyerd/inbucket/app/inbucket"
 )
 
 type State int
@@ -238,11 +238,21 @@ func (ss *Session) mailHandler(cmd string, arg string) {
 func (ss *Session) dataHandler() {
 	msgSize := uint64(0)
 
-	// Get a MailObject for each recipient
-	mailObjects := make([]*inbucket.MailObject, ss.recipients.Len())
+	// Get a Mailbox and a new Message for each recipient
+	mailboxes := make([]*inbucket.Mailbox, ss.recipients.Len())
+	messages := make([]*inbucket.Message, ss.recipients.Len())
 	i := 0
 	for e := ss.recipients.Front(); e != nil; e = e.Next() {
-		mailObjects[i] = ss.server.dataStore.NewMailObject(e.Value.(string))
+		recip := e.Value.(string)
+		mb, err := ss.server.dataStore.MailboxFor(recip)
+		if err != nil {
+			ss.error("Failed to open mailbox for %v", recip)
+			ss.send(fmt.Sprintf("554 Failed to open mailbox for %v", recip))
+			ss.enterState(READY)
+			return
+		}
+		mailboxes[i] = mb
+		messages[i] = mb.NewMessage()
 		i++
 	}
 
@@ -261,22 +271,23 @@ func (ss *Session) dataHandler() {
 		}
 		if line == ".\r\n" || line == ".\n" {
 			// Mail data complete
-			for _, mo := range mailObjects {
-				mo.Close()
+			for _, m := range messages {
+				m.Close()
 			}
 			ss.send("250 Mail accepted for delivery")
 			ss.info("Message size %v bytes", msgSize)
 			ss.enterState(READY)
 			return
 		}
+		// SMTP RFC says remove leading periods from input
 		if line != "" && line[0] == '.' {
 			line = line[1:]
 		}
 		msgSize += uint64(len(line))
 		// Append to message objects
-		for _, mo := range mailObjects {
-			if err := mo.Append([]byte(line)); err != nil {
-				ss.error("Failed to append to mailbox %v: %v", mo.Mailbox(), err)
+		for i, m := range messages {
+			if err := m.Append([]byte(line)); err != nil {
+				ss.error("Failed to append to mailbox %v: %v", mailboxes[i], err)
 				ss.send("554 Something went wrong")
 				ss.enterState(READY)
 				// TODO: Should really cleanup the crap on filesystem...
diff --git a/conf/app.conf b/conf/app.conf
index 8e24a2c..9e44eb3 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -10,7 +10,7 @@ smtpd.domain=skynet
 smtpd.port=2500
 datastore.path=/tmp/inbucket
 
-log.trace.output = off
+log.trace.output = stderr
 log.info.output  = stderr
 log.warn.output  = stderr
 log.error.output = stderr