Work on the new refactor of phirecms