Initial changes to enable --config instead of needing to use stdin