Ok, we can work on this in a separate PR. Could you rebase so I can merge this?