Work on the Phire 2 refactor