Affinity works.

Dig the rest of the changes to the command editor. Good job.