The U.S. Consumer Product Safety Commission’s Pool Safely campaign kicked it up a notch this past summer by launching an app and producing a children’s song – both designed to engage kids about staying safe around backyard pools. Next summer? A promotion tied to the Olympics.

Details are scant for now, but the federal agency is trying to tie its safety campaign to the 2016 Summer Olympics when all eyes will be on Rio where Michael Phelps is expected to make a big splashy return.

For now though, the agency’s PR push is focused on the Adventures of Splish and Splash, a video game that helps families teach their children about pool safety. The app can be downloaded for free at the Apple Store or Google Play.

The USCPSC also commissioned children’s artist Laurie Berkner to write the “Pool Safely Song,” which she performs at many of her concerts, according to an agency spokesperson.

Pool Safely currently has more than 800 partners – a mix of local governments, pool builders and industry stakeholders – who are handing out drowning prevention collateral. The agency is also in the process of giving its Spanish language website and materials a makeover.