Images

Lacking image test support, and images will need to be cleaned up later.