Started work on image support and external images