Move upcoming exercise logic into progression