[WIP] Support Marketplace products

This is a work in progress.

This change will NOT be backwards compatible.