clearn up workout selection and unclog overall controller a bit more.