More work on offsite marketplace