Move to new style quote box
Some more tests
Improved images, and a bunch of preps for Duchesne