Started writing clean demo app