Initial pass at adding text and images