Initial demo views, rebased against demo2 branch