Update w. marketplace & Loop provisions

Mock-up of feature additions