adding active merchant functionality etc