Increased granularity of _exercise

Includes PR #1.