Some work done with adding marketplaces (not finished)