Major contention point in section 8 (addr vs fqdn) is (hopefully) addressed