Rebased on latest Ace. Added Coffee Fold Mode