as discussed, we'll table this to another PR