Yeah. This can definitely be done in another PR :)