Work on phire2 refactor