Added more (more) image stuff for great completion