Merchant lockup spec WIP

by Mark Bult