Add logic for managing commands

some of these options aren't common. Only options that are used by the common code itself should be declared in the common options file.