Slowly extracting the demo, still a lot of compile errors
Separated demo code, one test failure remains in V7 library tests,
compile errors in demo code