Fixed package issue, started adding code for demo 1