Made a start at a demo framework lib