fix error
switch to status method
Add merchant
no default status
fixed merchant load problem
unify load order
add enum
remove unneeded
break out templating
add back payee
reorder
Add pin protection