Dictionary conversion nearly complete