no, let's tackle that in a separate PR, this is big enough as is