@matzew I can do it if we are in agreement, np at all

I will wait for the feedback from @lholmquist too