and i have this implemented but not extracted into a specific PR so i definitely have an idea of how to extract this