@jvanbaarsen yeap lets do it in another PR