Consolidate command code, improve help output, add data wrapper

Signed-off-by: Christopher Larson <chris_larson@mentor.com>