Start adding find5 support WIP