more work towards complete demo