Added more code to support the workouts.