F24 System Wide Change: Pungi Refactor