Working on fixing this build; added static extension to handle "Mather" searches from decompiled code.