Aesethetic Rejig of command line options. All broken.
Added command class for storing command data