incorporate new local-interface infrastructure into appropriate places