Looking at azrafe7 I have added some differences to get BasicDemo working, but currently the Enum seems an issue
but reluctant to go Dynamic so checking in work in progress