Nice quiz! Got them all except for the one who will be incoming in 2017. Probably tough enough already, but for an additional challenge, you could add the Secretary-General who served in an "Acting" capacity until the first SG was selected: Gladwyn Jebb, of the UK.