diff --git a/laptop/.config/isyncrc b/laptop/.config/isyncrc
index f467148..9afcb55 100644
--- a/laptop/.config/isyncrc
+++ b/laptop/.config/isyncrc
@@ -22,4 +22,31 @@ Patterns * !Junk !Deleted
 Create Near
 Sync All
 Expunge Near
-SyncState *
\ No newline at end of file
+SyncState *
+
+##
+
+IMAPAccount fastmail
+Host imap.fastmail.com
+Port 993
+User rob@rharbaugh.com
+PassCmd "rbw get fastmail-app-password"
+TLSType IMAPS
+CertificateFile /etc/ssl/certs/ca-bundle.crt
+
+IMAPStore fastmail-remote
+Account fastmail
+
+MaildirStore fastmail-local
+SubFolders Verbatim
+Path ~/mail/fastmail/
+Inbox ~/mail/fastmail/Inbox/
+
+Channel fastmail
+Far :fastmail-remote:
+Near :fastmail-local:
+Patterns * !Spam
+Create Near
+Sync All
+Expunge Near
+SyncState *
diff --git a/laptop/.config/khal/config b/laptop/.config/khal/config
new file mode 100644
index 0000000..9de7503
--- /dev/null
+++ b/laptop/.config/khal/config
@@ -0,0 +1,12 @@
+[calendars]
+[[fastmail]]
+path = ~/.local/share/calendars/fastmail/*
+color = light blue
+
+[sqlite]
+path = ~/.local/share/khal/db.sqlite
+
+[locale]
+timeformat = %H:%M
+dateformat = %Y-%m-%d
+datetimeformat = %Y-%m-%d %H:%M
diff --git a/laptop/.config/msmtp/config b/laptop/.config/msmtp/config
index d584167..6dc73c6 100644
--- a/laptop/.config/msmtp/config
+++ b/laptop/.config/msmtp/config
@@ -1,14 +1,22 @@
 defaults
-auth	xoauth2
-tls	on
-tls_trust_file	/etc/ssl/certs/ca-bundle.crt
-logfile		~/.local/share/msmtp/msmtp.log
+tls            on
+tls_trust_file /etc/ssl/certs/ca-bundle.crt
+logfile        ~/.local/share/msmtp/msmtp.log
 
-account		outlook
-host		smtp.office365.com
-port		587
-tls_starttls	on
-user		robharbaugh@outlook.com
-passwordeval	python3 /usr/share/neomutt/oauth2/mutt_oauth2.py ~/.config/neomutt/outlook.tokens --decryption-pipe 'gpg --decrypt'
+account        outlook
+auth           xoauth2
+host           smtp.office365.com
+port           587
+tls_starttls   on
+user           robharbaugh@outlook.com
+passwordeval   python3 /usr/share/neomutt/oauth2/mutt_oauth2.py ~/.config/neomutt/outlook.tokens --decryption-pipe 'gpg --decrypt'
 
-account default : outlook
\ No newline at end of file
+account        fastmail
+auth           plain
+host           smtp.fastmail.com
+port           587
+tls_starttls   on
+user           rob@rharbaugh.com
+passwordeval   rbw get fastmail-app-password
+
+account default : outlook
diff --git a/laptop/.config/neomutt/accounts/fastmail b/laptop/.config/neomutt/accounts/fastmail
new file mode 100644
index 0000000..7a062ad
--- /dev/null
+++ b/laptop/.config/neomutt/accounts/fastmail
@@ -0,0 +1,17 @@
+set realname  = "Rob Harbaugh"
+set from      = "rob@rharbaugh.com"
+
+set mbox_type = Maildir
+set folder    = ~/mail/fastmail
+set spoolfile = +Inbox
+set postponed = +Drafts
+set trash     = +Trash
+
+set sendmail      = "/usr/bin/msmtp -a fastmail"
+set envelope_from = yes
+set sendmail_wait = 0
+
+set signature = ~/.config/neomutt/signature
+
+unmailboxes *
+mailboxes =Inbox =Drafts =Sent =Trash =Archive
diff --git a/laptop/.config/neomutt/accounts/personal b/laptop/.config/neomutt/accounts/personal
index 60ed493..f0926cb 100644
--- a/laptop/.config/neomutt/accounts/personal
+++ b/laptop/.config/neomutt/accounts/personal
@@ -8,8 +8,9 @@ set postponed	=	+Drafts
 set trash	=	+Trash
 
 set signature	=	~/.config/neomutt/signature
-set sendmail	=	"/usr/bin/msmtp"
+set sendmail	=	"/usr/bin/msmtp -a outlook"
 set envelope_from = yes
 set sendmail_wait	=	0
 
+unmailboxes *
 mailboxes =Inbox =Drafts =Sent =Archive =Trash =Church =Family =House =Work =Notes
\ No newline at end of file
diff --git a/laptop/.config/neomutt/neomuttrc b/laptop/.config/neomutt/neomuttrc
index 81b5880..d2f4a56 100644
--- a/laptop/.config/neomutt/neomuttrc
+++ b/laptop/.config/neomutt/neomuttrc
@@ -88,3 +88,7 @@ color body  underline  color111  color235  "<[^ ]+@[^ ]+>"
 
 # Sidebar toggle
 bind index,pager B sidebar-toggle-visible
+
+# Account switching
+macro index <F2> '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/personal<enter><change-folder>!<enter><refresh>' "Switch to Outlook"
+macro index <F3> '<sync-mailbox><enter-command>source ~/.config/neomutt/accounts/fastmail<enter><change-folder>!<enter><refresh>' "Switch to Fastmail"
diff --git a/laptop/.config/vdirsyncer/config b/laptop/.config/vdirsyncer/config
new file mode 100644
index 0000000..b09840c
--- /dev/null
+++ b/laptop/.config/vdirsyncer/config
@@ -0,0 +1,18 @@
+[general]
+status_path = "~/.local/share/vdirsyncer/status/"
+
+[pair fastmail_calendar]
+a = "fastmail_calendar_local"
+b = "fastmail_calendar_remote"
+collections = ["from a", "from b"]
+
+[storage fastmail_calendar_local]
+type = "filesystem"
+path = "~/.local/share/calendars/fastmail/"
+fileext = ".ics"
+
+[storage fastmail_calendar_remote]
+type = "caldav"
+url = "https://caldav.fastmail.com/dav/"
+username = "rob@rharbaugh.com"
+password.fetch = ["command", "rbw", "get", "fastmail-app-password"]
diff --git a/laptop/.zshrc b/laptop/.zshrc
index 74d47bd..96c005f 100644
--- a/laptop/.zshrc
+++ b/laptop/.zshrc
@@ -20,6 +20,7 @@ export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$HOME/go/bin:$HOME/.local/bin:$PA
 # Aliases
 alias e="emacsclient -t -a \"\""
 alias mbsync="mbsync -a"
+alias calsync="vdirsyncer sync"
 alias c="clear"
 alias cat="bat --paging=never --style=plain"
 alias cp="cp -riv"