Marketplace working

This branch can be moved, as the previous version is obsolete.