Always trust public keys, big rewrite