More WIP on demo app