Marketplace working

updating the master with the best working copy.