Updates for Data Dealer demo

We didn't have permissions to modify the m3 version of the repo so we forked. If you want to get those changes back into the m3 repo and keep that as record of reference, you can merge from here.