Split into two files, some improvements to Plates.