Working on demo
More progress on demo page