Basic setup of demo
Made some changes