Finished refactor of the QPs