diff --git a/README.md b/README.md
index 369e46a..0a96729 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ Current tool set:
 - tmux
 - zsh (I try fish every few months.. never sticks though)
 - vim + vundle + too many plugins
-- mutt + mbsync + notmuch (new to this. Also considering just notmuch + alot + afew)
+- mbsync + notmuch + afew + alot + msmtp (Very new to this, but liking it so far)
 - weechat
 - Firefox + vimperator
 
diff --git a/afew/config b/afew/config
index 0cc41d4..1afe4cd 100644
--- a/afew/config
+++ b/afew/config
@@ -1,7 +1,28 @@
-# This is the default filter chain
 [SpamFilter]
 #[ClassifyingFilter]
 [KillThreadsFilter]
 [ListMailsFilter]
 [ArchiveSentMailsFilter]
+
+#[Filter.1]
+#message = Tagging IOCOM netmon emails
+#query = to:netmon@insors.com
+#tags = +netmon;-new
+
+[FolderNameFilter]
+folder_blacklist = iocom/INBOX
+folder_transforms = Archive:archive Drafts:drafts Sent:sent Trash:trash Builder:builder Info:info Netmon:netmon Spam:spam
+
+[Filter.1]
+message = Removing archived mails from inbox
+query = tag:archive
+tags = -new;-archive
+
 [InboxFilter]
+
+[MailMover]
+folders = iocom/INBOX/ iocom/INBOX.Archive/
+max_age = 15
+
+iocom/INBOX/ = 'NOT tag:inbox':iocom/INBOX.Archive/
+iocom/INBOX.Archive/ = 'tag:inbox':iocom/INBOX/
diff --git a/alot/config b/alot/config
index a95f1c6..ebafb3d 100644
--- a/alot/config
+++ b/alot/config
@@ -4,11 +4,16 @@ tabwidth = 4
 [accounts]
     [[IOCOM]]
         realname = Dustin Swan
-        address = dustinswan@gmail.com
+        address = dswan@iocom.com
         gpg_key = 2B3A6377
         sendmail_command = msmtp --account=DswanIOCOM -t
+        sent_box = maildir:///users/dustinswan/.mail/iocom/INBOX.Sent
+        draft_box = maildir:///users/dustinswan/.mail/iocom/INBOX.Drafts
+        # sent_tags = sent
 
     [[Gmail]]
         realname = Dustin Swan
-        address = dswan@iocom.com
+        address = dustinswan@gmail.com
+        gpg_key = 2B3A6377
         sendmail_command = msmtp --account=DustinswanGmail -t
+        # sent_tags = sent
diff --git a/bin/browser b/bin/browser
new file mode 100755
index 0000000..7ab25b8
--- /dev/null
+++ b/bin/browser
@@ -0,0 +1,2 @@
+#!/bin/sh
+open -a Firefox.app "$1"
diff --git a/bin/check_mail.sh b/bin/check_mail.sh
new file mode 100755
index 0000000..2912a46
--- /dev/null
+++ b/bin/check_mail.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+while true; do
+    few -m; mbsync iocom; notmuch new
+    sleep 45
+done
diff --git a/bootstrap-mac.sh b/bootstrap-mac.sh
index 3946143..e1890d2 100644
--- a/bootstrap-mac.sh
+++ b/bootstrap-mac.sh
@@ -42,6 +42,9 @@ brew install isync
 brew install mosh
 brew install haskell-platform
 brew install brew-cask
+brew install gnupg
+brew install gpg-agent
+brew install gpgme
 brew cask install rdio
 brew cask install alfred
 brew cask alfred link
diff --git a/mbsyncrc b/mbsyncrc
index 65a5573..57e6d26 100644
--- a/mbsyncrc
+++ b/mbsyncrc
@@ -13,11 +13,11 @@ Account gmail
 MaildirStore gmail-local
 Path ~/.mail/gmail/
 Inbox ~/.mail/gmail/INBOX
-Flatten .
 
 Channel gmail
 Master :gmail-remote:
 Slave :gmail-local:
+#Path "[Gmail]."
 # Include everything
 Patterns *
 # Automatically create missing mailboxes, both locally and on the server
@@ -37,10 +37,12 @@ UseIMAPS yes
 
 IMAPStore iocom-remote
 Account iocom
+Path INBOX
 
 MaildirStore iocom-local
 Path ~/.mail/iocom/
 Inbox ~/.mail/iocom/INBOX
+Flatten .
 
 Channel iocom
 Master :iocom-remote:
diff --git a/msmtprc b/msmtprc
index fadf6ce..88134ca 100644
--- a/msmtprc
+++ b/msmtprc
@@ -1,21 +1,31 @@
+defaults
+protocol smtp
+logfile ~/.msmtp.log
+
 account DustinswanGmail
 host smtp.gmail.com
 port 587
 protocol smtp
-auth on
 from dustinswan@gmail.com
 user dustinswan@gmail.com
 passwordeval gpg --no-tty -d ~/.gmail-password.gpg
+auth on
 #tls on
 #tls_trust_file ~/.mutt/gmail_cert
 
+
+
 account DswanIOCOM
 host secure.emailsrvr.com
-port 587
 protocol smtp
 auth on
+port 587
 from dswan@iocom.com
+tls on
+tls_starttls on
+tls_trust_file /usr/local/etc/openssl/cert.pem
 user dswan@insors.com
-passwordeval gpg --no-tty -d ~/.iocom-password.gpg
+passwordeval gpg -d ~/.iocom-password.gpg
+
 
 account default : DustinswanGmail
diff --git a/offlineimaprc b/offlineimaprc
new file mode 100644
index 0000000..4ee56d6
--- /dev/null
+++ b/offlineimaprc
@@ -0,0 +1,15 @@
+[general]
+accounts = IOCOM
+
+[Account IOCOM]
+localrepository = IOCOMLocal
+remoterepository = IOCOMRemote
+
+[Repository IOCOMLocal]
+type = Maildir
+localfolders = ~/.mail/iocom
+
+[Repository IOCOMRemote]
+type = IMAP
+remotehost = secure.emailsrvr.com
+remoteuser = dswan@insors.com
diff --git a/mutt_for_offlineimap/offlineimap.py b/passwords.py
similarity index 100%
rename from mutt_for_offlineimap/offlineimap.py
rename to passwords.py
diff --git a/zshrc b/zshrc
index 5d7db66..1623e71 100644
--- a/zshrc
+++ b/zshrc
@@ -18,8 +18,8 @@ export MOSH_TITLE_NOPREFIX=1
 export BROWSER=open
 [[ -s luakit ]] && export BROWSER=luakit
 
-alias browser='open'
-[[ -s luakit ]] && alias browser='luakit'
+#alias browser='open -a Firefox.app'
+#[[ -s luakit ]] && alias browser='luakit'
 
 # IOCOM stuff
 export P4USER=dswan