Added codes for namematching controller (not tested yet), waiting for UI codes to be ready