Mailbox vs Buffered

Added some #defines to allow us to switch easily between Mailbox mode and Buffered mode.