Match refactoring and use forge RB
Flan's being messy again? ;)