Very preliminary makePDF revamp