Demo app re-worked