Done - after wrestling with dicts, it solves pyramids.