More work
Re-add some lost code
Add text icon to demo app
Add some text to demo app
Add missing files