Preliminary implementation of PQ