Roughed out the IMAP design a bit more