Using image atlases - still some cleanup required.