Yes, though a lot of the Apollo infrastructure was in retrospect massively over-engineered, based on a very high estimate of required numbers of launches. This

Yes, though a lot of the Apollo infrastructure was in retrospect massively over-engineered, based on a very high estimate of required numbers of launches. This was partly because they needed to start the infrastructure before settling the mission mode but still, the plans were ambitions beyond what was strictly required to get to the moon by the end of the decade.