Initial merge-commit of the OIC code. Should successfully do discovery for single...