Locality reworked

^^ finally