Yup, mind added "Pick this brick up from the bottom of the pool"
NAUI requires 15 continuous stroke cycles (any stroke), 10 minute survival swim, and 50 ft underwater swim. Of course, the instructor is allowed to require more beyond this minimum requirement.