Merchants 1

Initial commit for the new merchant system