initial commit with updates for Yahoo Demo Tests