Rewrite to use new Callum027/openldap module