Add diff feature and start to consolidate command line processing.