On second thought I'm moving this to a separate PR