Work in progress
Get Marketplace login working