Work on the phire 2 refactor