Entrust 2.0

A full review in the whole codebase. (: