WIP - adding pqs