Added leader mapping and some stuff...