WIP - migrating demo application to Alloy