[2021/23] Rewrite needed

[ceribe]

At the moment the solution is terrible. It's slow, ugly and breaks DRY. It would need to be either fully rewritten or generalised so that both parts use the same code instead of having it copy pasted.