He was definitely planning on PII abuse at scale for personal gain from day one. Probably not planning mass surveillance, but from all we know of him, he wouldn't have disliked the idea.