still working on merchant