One part of my YMCA course (scuba diver, no other level other than instructor in 1970) involved a game of underwater hockey every pool session with just mask and fins to develop comfort in the water and conditioning. Also gear was tank and regulator, no octo or BC, wasn't yet conceived of yet...