do you want to rewrite this before we merge or in a new PR?