More work getting Collage in shape.