This is along the lines of what I was thinking, but we'd need it for all commands. So should this be done in the options.rb potentially?