Cut down typeplate again, add CPT
Fiddle Fiddle Fiddle

And we're almost there!