Initial version with tadd searching and validation