Nutted out the structure a lot more. Gaufrette will act as the image pool in all cases now.