Revert "Revert "introducing goodmarket and map for firms""

This reverts commit cc1d23e07eeeec2a15152e745a20798b7e0efccb.