Started on text and content/image

Updated demo to exercise new wrappers