Started to implement the new encryption module and key manager to follow.