Update to ExerciseDevices

Clean up and tie-in to presentation