Initial version of PQ model with tests