Various changes to get demo app working.
current work
manually merged pr