Import 25-06 - Initial commit

This is import of my pidcat fork from another repo