I did some ldap thingies
Merge
Merge more