The pattern matching was 'nice' when doing it for the first time ( can see all my logic) but htat's very subjective ... refactoring it with for comp is very very cool

I'll have to do this on the other APIs! For 2.9 ...