...Don't forget (and TBF the NASA obit mention this) in addition to his involvement in Apollo he had two Space Shuttle flights on his CV. The second one (STS-51-C) was the first dedicated DoD mission, some details of which
AFAIK are still classified.