Shifting to easier use of images

Note: Asserts are now being tripped.