diff --git a/phoronix/reduce_phoronix b/phoronix/reduce_phoronix
old mode 100755
new mode 100644
index 5663407..f356c06
--- a/phoronix/reduce_phoronix
+++ b/phoronix/reduce_phoronix
@@ -1,17 +1,288 @@
 #!/bin/bash
-egrep 'Test: |Average' results_phoronix_tuned_*.out | grep -v stress > tmpfile
-echo "Test:BOPs"
-toggle=0
-while IFS= read -r line
-do
-	if [ $toggle -eq 0 ]; then
-		out=`echo $line | cut -d':' -f2 | sed "s/^ //g" | sed "s/\[1\;34m//g"`
-		printf "%s:" "$out"
-		toggle=1
-	else
-		out=`echo $line | cut -d':' -f 2 | cut -d' ' -f 2 | sed "s/\[1\;34m//g"`
-		printf "%s\n" $out
-		toggle=0
-	fi
-done < "tmpfile"
-rm tmpfile
+
+usage() {
+    echo "Usage:"
+    echo "  ./reduce_phoronix --sub_test <test_ran> --tmp_name <output_temp_file>"
+    echo "Options:"
+    echo "  -h          Show help"
+    echo "  --sub_test  Specify the test data to reduce"
+    echo "  --tmp_file  Specify output temp file"
+    exit 1
+}
+
+# Initialize variables
+test_ran="none"
+tmp_file="none"
+
+reduce_cockroach() {
+    echo "Workload:Concurrency:Average:Deviation" > "$tmp_file"
+    # Read and process the results file
+    while IFS= read -r line; do
+        # Check for lines containing workload and concurrency
+        if [[ $line == *Workload* ]]; then
+            # Extract Workload and Concurrency
+            workload=$(echo "$line" | awk -F ': ' '{print $2}' | awk -F ' - ' '{print $1}')
+            concurrency=$(echo "$line" | awk -F ': ' '{print $3}' | tr -d ':')
+        fi
+        if [[ $line == *Average* ]]; then
+            # Extract Average
+            average=$(echo "$line" | awk -F ': ' '{print $2}' | awk '{print $1}')
+        fi
+        if [[ $line == *Deviation* ]]; then
+            # Extract Deviation
+            deviation=$(echo "$line" | awk -F ': ' '{print $2}' | tr -d '%')
+            # Append the extracted information to the output file
+            echo "$workload:$concurrency:$average:$deviation" >> "$tmp_file"
+        fi
+    done < /tmp/results_phoronix_"$test_ran"_tuned_*.out
+}
+
+reduce_phpbench() {
+    echo "Average:Deviation" > "$tmp_file"
+    # Read and process the results file
+    while IFS= read -r line; do
+        if [[ $line == *"Average:"* ]]; then
+            # Extract Average value
+            average=$(echo "$line" | awk -F 'Average: ' '{print $2}' | awk '{print $1}')
+        fi
+        if [[ $line == *"Deviation:"* ]]; then
+            # Extract Deviation value
+            deviation=$(echo "$line" | awk -F 'Deviation: ' '{print $2}' | tr -d '%')
+            # Append the extracted information to the output file
+            echo "$average:$deviation" >> "$tmp_file"
+        fi
+    done < /tmp/results_phoronix_"$test_ran"_tuned_*.out
+}
+
+reduce_redis() {
+    echo "Test:ParallelConnections:Average:Deviation" > "$tmp_file"
+    # Read and process the results file
+    while IFS= read -r line; do
+        # Check for lines containing Test and Parallel Connections
+        if [[ $line == *"Test:"* && $line == *"Parallel Connections:"* ]]; then
+            # Extract Test and Parallel Connections
+            test=$(echo "$line" | awk -F 'Test: ' '{print $2}' | awk -F ' - ' '{print $1}')
+            parallel_connections=$(echo "$line" | awk -F ': ' '{print $3}' | tr -d ':')
+        fi
+        if [[ $line == *"Average:"* ]]; then
+            # Extract Average
+            average=$(echo "$line" | awk -F ': ' '{print $2}' | awk '{print $1}')
+        fi
+        if [[ $line == *"Deviation:"* ]]; then
+            # Extract Deviation
+            deviation=$(echo "$line" | awk -F ': ' '{print $2}' | tr -d '%')
+            # Append the extracted information to the output file
+            echo "$test:$parallel_connections:$average:$deviation" >> "$tmp_file"
+        fi
+    done < /tmp/results_phoronix_"$test_ran"_tuned_*.out
+}
+
+reduce_cassandra() {
+    echo "Test:Average:Deviation" > "$tmp_file"
+    # Read and process the results file
+    while IFS= read -r line; do
+        # Check for lines containing Test
+        if [[ $line == *"Test:"* ]]; then
+            # Extract Test name (after "Test: " and before the colon)
+            test=$(echo "$line" | awk -F 'Test: ' '{print $2}' | awk -F ':' '{print $1}')
+        fi
+        if [[ $line == *"Average:"* ]]; then
+            # Extract Average value
+            average=$(echo "$line" | awk -F 'Average: ' '{print $2}' | awk '{print $1}')
+        fi
+        if [[ $line == *"Deviation:"* ]]; then
+            # Extract Deviation value
+            deviation=$(echo "$line" | awk -F 'Deviation: ' '{print $2}' | tr -d '%')
+            # Append the extracted information to the output file
+            echo "$test:$average:$deviation" >> "$tmp_file"
+        fi
+    done < /tmp/results_phoronix_"$test_ran"_tuned_*.out
+}
+
+reduce_apache-iotdb() {
+    # Header for CSV file
+    echo "device_count:batch_size:sensor_count:client_number:point_sec:latency" > "$tmp_file"
+
+    # Initialize variables to store values for each test configuration
+    device_count=""
+    batch_size=""
+    sensor_count=""
+    client_number=""
+    point_sec=""
+    latency=""
+    # Iterate through the test output file (replace this with the actual test output file)
+    while IFS= read -r line; do
+        # Extract the configuration line (e.g., Device Count: 100 - Batch Size Per Write: 1 - Sensor Count: 200 - Client Number: 100)
+        if [[ "$line" =~ \[\Device\ Count:\ ([0-9]+).*Batch\ Size\ Per\ Write:\ ([0-9]+).*Sensor\ Count:\ ([0-9]+).*Client\ Number:\ ([0-9]+)] ]]; then
+            # Save the configuration
+            device_count="${BASH_REMATCH[1]}"
+            batch_size="${BASH_REMATCH[2]}"
+            sensor_count="${BASH_REMATCH[3]}"
+            client_number="${BASH_REMATCH[4]}"
+        fi
+        # Extract points/sec (e.g., Average: 139645 point/sec)
+        if [[ "$line" =~ Average:\ ([0-9]+)\ point/sec ]]; then
+            point_sec="${BASH_REMATCH[1]}"
+        fi
+        # Extract latency (e.g., Average Latency: 117.59)
+        if [[ "$line" =~ Average\ Latency:\ ([0-9]+\.[0-9]+) ]]; then
+            latency="${BASH_REMATCH[1]}"
+        fi
+        # After reading the point_sec and latency for a test configuration, append it to the output CSV
+        if [[ -n "$device_count" && -n "$batch_size" && -n "$sensor_count" && -n "$client_number" ]]; then
+            echo "$device_count:$batch_size:$sensor_count:$client_number:${point_sec:-}:$latency" >> "$tmp_file"
+            device_count=""
+            batch_size=""
+            sensor_count=""
+            client_number=""
+            point_sec=""
+            latency=""
+        fi
+    done < /tmp/results_phoronix_"$test_ran"_tuned_*.out
+}
+
+reduce_nginx(){
+  echo "Connections:RPS" > "$tmp_file"
+  while IFS= read -r line; do
+        # Check for lines containing Connections
+        if [[ $line == *"Connections:"* ]]; then
+            # Extract Test name (after "Connections: " and before the colon)
+            connection=$(echo "$line" | awk -F 'Connections: ' '{print $2}' | awk -F ':' '{print $1}')
+        fi
+        if [[ $line == *"Average:"* ]]; then
+            # Extract Average value
+            average=$(echo "$line" | awk -F 'Average: ' '{print $2}' | awk '{print $1}')
+        fi
+        if [[ $line == *"Deviation:"* ]]; then
+            # Extract Deviation value
+            deviation=$(echo "$line" | awk -F 'Deviation: ' '{print $2}' | tr -d '%')
+            # Append the extracted information to the output file
+            echo "$connection:$average:$deviation" >> "$tmp_file"
+        fi
+    done < /tmp/results_phoronix_"$test_ran"_tuned_*.out
+}
+
+reduce_stress_ng() {
+    echo "Test:Average:Deviation" > "$tmp_file"
+    # Read and process the results file
+    while IFS= read -r line; do
+        # Check for lines containing Test
+        if [[ $line == *"Test:"* ]]; then
+            # Extract Test name (after "Test: " and before the colon)
+            test=$(echo "$line" | awk -F 'Test: ' '{print $2}' | awk -F ':' '{print $1}')
+        fi
+        if [[ $line == *"Average:"* ]]; then
+            # Extract Average value
+            average=$(echo "$line" | awk -F 'Average: ' '{print $2}' | awk '{print $1}')
+        fi
+        if [[ $line == *"Deviation:"* ]]; then
+            # Extract Deviation value
+            deviation=$(echo "$line" | awk -F 'Deviation: ' '{print $2}' | tr -d '%')
+            # Append the extracted information to the output file
+            echo "$test:$average:$deviation" >> "$tmp_file"
+        fi
+    done < /tmp/results_phoronix_"$test_ran"_tuned_*.out
+}
+
+reduce_sqlite() {
+    echo "Threads:Average:Deviation" > "$tmp_file"
+    # Read and process the results file
+    while IFS= read -r line; do
+        # Check for lines containing Threads
+        if [[ $line == *"Threads / Copies:"* ]]; then
+            # Extract Test name (after "Test: " and before the colon)
+            test=$(echo "$line" | awk -F 'Threads / Copies: ' '{print $2}' | awk -F ':' '{print $1}')
+        fi
+        if [[ $line == *"Average:"* ]]; then
+            # Extract Average value
+            average=$(echo "$line" | awk -F 'Average: ' '{print $2}' | awk '{print $1}')
+        fi
+        if [[ $line == *"Deviation:"* ]]; then
+            # Extract Deviation value
+            deviation=$(echo "$line" | awk -F 'Deviation: ' '{print $2}' | tr -d '%')
+            # Append the extracted information to the output file
+            echo "$threads:$average:$deviation" >> "$tmp_file"
+        fi
+    done < /tmp/results_phoronix_"$test_ran"_tuned_*.out
+}
+
+reduce_openssl() {
+    echo "Algorithm:BPS:Deviation" > "$tmp_file"
+    # Read and process the results file
+    while IFS= read -r line; do
+        # Check for lines containing Threads
+        if [[ $line == *"Algorithm:"* ]]; then
+            # Extract Algorithm name (after "Algorithm: " and before the colon)
+            algorithm=$(echo "$line" | awk -F 'Algorithm: ' '{print $2}' | awk -F ':' '{print $1}')
+        fi
+        if [[ $line == *"Average:"* ]]; then
+            # Extract Average value
+            average=$(echo "$line" | awk -F 'Average: ' '{print $2}' | awk '{print $1}')
+        fi
+        if [[ $line == *"Deviation:"* ]]; then
+            # Extract Deviation value
+            deviation=$(echo "$line" | awk -F 'Deviation: ' '{print $2}' | tr -d '%')
+            # Append the extracted information to the output file
+            echo "$algorithm:$average:$deviation" >> "$tmp_file"
+        fi
+    done < /tmp/results_phoronix_"$test_ran"_tuned_*.out
+}
+
+# Check if an argument is passed
+if [ $# -eq 0 ]; then
+    usage
+fi
+
+
+# Process command line arguments
+while [ $# -gt 0 ]; do
+    case $1 in
+        -h)
+            usage
+            ;;
+        --sub_test)
+            test_ran=$2
+            shift 2
+            ;;
+        --tmp_file)
+            tmp_file=$2
+            shift 2
+            ;;
+        *)
+            usage
+            ;;
+    esac
+done
+
+# Check if a test data to reduce is designated
+if [ "$test_ran" == "none" ]; then
+    echo "You need to designate a test to reduce."
+    usage
+fi
+if [ "$tmp_file" == "none" ]; then
+    echo "You need a file to output to"
+    usage
+fi
+
+if [[ ${test_ran} == "cockroach" ]]; then
+    reduce_cockroach
+elif [[ ${test_ran} == "redis" ]]; then
+    reduce_redis
+elif [[ ${test_ran} == "stress-ng" ]]; then
+    reduce_stress_ng
+elif [[ ${test_ran} == "phpbench" ]]; then
+    reduce_phpbench
+elif [[ ${test_ran} == "cassandra" ]]; then
+    reduce_cassandra
+elif [[ ${test_ran} == "apache-iotdb" ]]; then
+    reduce_apache-iotdb
+elif [[ ${test_ran} == "nginx" ]]; then
+    reduce_nginx
+elif [[ ${test_ran} == "sqlite" ]]; then
+    reduce_sqlite
+elif [[ ${test_ran} == "openssl" ]]; then
+    reduce_openssl
+else
+    echo "Unsupported test: ${test_ran}"
+    exit 1
+fi
\ No newline at end of file
diff --git a/phoronix/run_phoronix.sh b/phoronix/run_phoronix.sh
old mode 100755
new mode 100644
index d046834..92940ef
--- a/phoronix/run_phoronix.sh
+++ b/phoronix/run_phoronix.sh
@@ -16,27 +16,16 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-test_index="Test All Options"
+test_name="phoronix"
+GIT_VERSION="v10.8.1"
+yaml_file="test_index.yaml"
+rtc=0
 
 arguments="$@"
 
-error_out()
-{
-	echo $1
-	exit $2
-
-}
-
-usage()
-{
-	echo "Usage:"
-	echo "  --test_index: test index to run.  Default is $test_index"
-	echo "  --tools_git: Location to pick up the required tools git, default"
-	echo "    https://github.com/redhat-performance/test_tools-wrappers"
-	echo "  --usage: this usage message"
-	source test_tools/general_setup --usage
-}
-
+#
+# Get the directory we are running out of.
+#
 curdir=`pwd`
 if [[ $0 == "./"* ]]; then
 	chars=`echo $0 | awk -v RS='/' 'END{print NR-1}'`
@@ -57,8 +46,7 @@ else
 	fi
 fi
 
-test_name="phoronix"
-GIT_VERSION="v10.8.1"
+
 if [ ! -f "/tmp/${test_name}.out" ]; then
 	command="${0} $@"
 	echo $command
@@ -72,14 +60,32 @@ if [ ! -f "/tmp/${test_name}.out" ]; then
 fi
 
 #
-# Get the directory we are running out of.
+# Clone the repo that contains the common code and tools
 #
 tools_git=https://github.com/redhat-performance/test_tools-wrappers
 
 
-#
-# Clone the repo that contains the common code and tools
-#
+error_out()
+{
+	echo $1
+	exit $2
+
+}
+
+usage()
+{
+	echo "  Usage:"
+	echo "  --test_index: test index to run.  Default is $test_index"
+	echo "  --sub_test test running: Test we are to run. Supported tests are"
+	echo "    cockroach, cassandra, couchdb and hbase"
+	echo "  --test_option_override <parameterA=value1,value2>|<parameterB=value1>"
+	echo "  --tools_git: Location to pick up the required tools git, default"
+	echo "    https://github.com/redhat-performance/test_tools-wrappers"
+	echo "  --usage: this usage message"
+	test_tools/general_setup --usage
+	exit 1
+}
+
 show_usage=0
 found=0
 for arg in "$@"; do
@@ -109,6 +115,7 @@ if [ ! -d "test_tools" ]; then
         git clone $tools_git test_tools
         if [ $? -ne 0 ]; then
                 error_out "Error pulling git $tools_git" 1
+                exit
         fi
 else
 	echo Found an existing test_tools directory, using it.
@@ -118,35 +125,6 @@ if [ $show_usage -eq 1 ]; then
 	usage $0
 fi
 
-test_tools/package_tool --update
-test_tools/package_tool --packages php73-cli.x86_64,php73-common.x86_64,php73-xml.x86_64
-if [[ $? != "0" ]]; then
-	#
-	# Check to see if we need to remove the old php
-	#
-	test_tools/package_tool --is_installed php-cli.x86_64
-	if [ $? -eq 0 ]; then
-		packages="php-cli.x86_64 php-common.x86_64 php-xml.x86_64"
-		#
-		# Remove and add the proper php
-		#
-		test_tools/package_tool --remove_packages $packages
-		if [ $? -ne 0 ]; then
-			error_out "Failed to remove $packages" 1
-		fi
-	fi
-	test_tools/package_tool --packages php73-cli.x86_64,php73-common.x86_64,php73-xml.x86_64
-	if [ $? -ne 0 ]; then
-		#
-		# Just to be difficult Amazon 2 uses even different packages.
-		#
-		test_tools/package_tool --packages git,php-cli,php-xml,php-json
-		if [ $? -ne 0 ]; then
-			error_out "Failed to install $packages" 1
-		fi
-	fi
-fi
-
 # Variables set by general setup.
 #
 # TOOLS_BIN: points to the tool directory
@@ -166,7 +144,9 @@ ${curdir}/test_tools/gather_data ${curdir}
 source test_tools/general_setup "$@"
 
 ARGUMENT_LIST=(
-	"test_index"
+        "test_index"
+        "sub_test"
+        "test_option_override"
 )
 
 NO_ARGUMENTS=(
@@ -187,35 +167,101 @@ opts=$(getopt \
 #
 if [ $? -ne 0 ]; then
 	error_out "Error with option parsing" 1
-        exit
 fi
 
 eval set --$opts
 
 while [[ $# -gt 0 ]]; do
-        case "$1" in
-		--test_index)
-			test_index=$2
-			shift 2
-		;;
-                -h)
-			usage
-		;;
-	        --usage)
-			usage
-                        exit
-                ;;
-		--)
-			break;
-		;;
-		*)
-			echo option not found $1
-			usage
-			exit
-		;;
-        esac
+    case "$1" in
+    --test_index)
+      test_index=$2
+      shift 2
+    ;;
+    --sub_test)
+      sub_test=${2}
+      shift 2
+    ;;
+    --test_option_override)
+      test_option_override=$2
+      shift 2
+    ;;
+    -h)
+      usage
+    ;;
+    --usage)
+      usage
+      exit
+    ;;
+    --)
+      break;
+    ;;
+    *)
+      echo option not found $1
+      usage
+      exit
+    ;;
+    esac
 done
 
+parse_yaml() {
+    local yaml_file=$1
+    local subtest=$2
+    local option=$3
+
+    # Use yq to extract the value from the YAML file
+    yq eval ".subtests.$subtest.options.$option" "$yaml_file"
+}
+
+generate_ph_opts() {
+
+    local subtest=$1
+    local override_options=$2
+
+    declare -A options
+
+    # ParoIe the YAML file to get the default options
+    local default_keys=$(yq eval ".subtests.$subtest.options | keys | .[] | select(test(\"^default_\"))" "$yaml_file")
+    mapfile -t ordered_keys <<< "$default_keys"
+
+    # Parse default options and store in options associative array
+    for key in "${ordered_keys[@]}"; do
+        # Extract parameter name by removing 'default_' prefix
+        local param=${key#default_}
+        # Get the default value from YAML
+        options[$param]=$(parse_yaml "$yaml_file" "$subtest" "$key")
+    done
+
+    #empty the file
+    > /tmp/ph_opts
+
+   # Process overrides, if any
+    if [[ -n "$override_options" ]]; then
+        IFS='|' read -r -a overrides <<< "$override_options"
+        for override in "${overrides[@]}"; do
+            echo ${override}
+            IFS='=' read -r key values <<< "$override"
+            if [[ -n "${options[$key]}" ]]; then
+                options[$key]=$values
+            else
+                echo "Unknown option: $key"
+                exit 1
+            fi
+        done
+    fi
+
+    #Add in correct order
+    for key in "${ordered_keys[@]}"; do
+        param=${key#default_}
+        echo "${options[$param]}" >> /tmp/ph_opts
+    done
+
+    echo "n" >> /tmp/ph_opts
+}
+
+if [[ $sub_test == "none" ]]; then
+        echo You must designate a test.
+        usage $0
+fi
 
 if [ $to_pbench -eq 1 ]; then
 	source ~/.bashrc
@@ -225,63 +271,77 @@ if [ $to_pbench -eq 1 ]; then
 		move_back=1
 		mv $move_this /tmp/perf
 	fi
-	echo $TOOLS_BIN/execute_via_pbench --cmd_executing "$0" $arguments --test $test_name --spacing 11 --pbench_stats $to_pstats
-	$TOOLS_BIN/execute_via_pbench --cmd_executing "$0" $arguments --test $test_name --spacing 11 --pbench_stats $to_pstats
+	echo $TOOLS_BIN/execute_via_pbench --cmd_executing "$0" $arguments --test $test_name_sub_test --spacing 11 --pbench_stats $to_pstats
+	$TOOLS_BIN/execute_via_pbench --cmd_executing "$0" $arguments --test $test_name_sub_test --spacing 11 --pbench_stats $to_pstats
 	if [ $move_back -eq 1 ]; then
 		mv /tmp/perf $move_this
 	fi
+	exit
 else
-	if [ $to_user == "ubuntu" ]; then
-		DEBIAN_FRONTEND=noninteractive apt-get install -y -q php-cli
-		DEBIAN_FRONTEND=noninteractive apt-get install -y -q php-xml
-	fi
-	cd $run_dir
-	#
-	# phoronix run parameters.
-	#
-	# Right now we only support stress-ng
-	#
-	if [ ! -d "./phoronix-test-suite" ]; then
-		git clone -b $GIT_VERSION --single-branch --depth 1 https://github.com/phoronix-test-suite/phoronix-test-suite
-	fi
-	echo 1 | ./phoronix-test-suite/phoronix-test-suite install stress-ng
-	echo $test_index > /tmp/ph_opts
-	echo n >> /tmp/ph_opts
-	
-	#
-	# Run phoronix test
-	#
-	if [[ -f /tmp/results_${test_name}_${to_tuned_setting}.out ]]; then
-		rm /tmp/results_${test_name}_${to_tuned_setting}.out
+        if [ $to_user == "ubuntu" ]; then
+                DEBIAN_FRONTEND=noninteractive apt-get install -y -q php-cli
+                DEBIAN_FRONTEND=noninteractive apt-get install -y -q php-xml
+        fi
+        cd $run_dir
+        #
+        # phoronix run parameters.
+        #
+        # Right now we only support stress-ng
+        #
+        if [ ! -d "./phoronix-test-suite" ]; then
+                git clone -b $GIT_VERSION --single-branch --depth 1 https://github.com/phoronix-test-suite/phoronix-test-suite
+        fi
+        echo 1 | ./phoronix-test-suite/phoronix-test-suite install ${sub_test}
+        #
+        # Run phoronix test
+        #
+        if [[ -f /tmp/results_${test_name}_${sub_test}_${to_tuned_setting}.out ]]; then
+                rm /tmp/results_${test_name}_${sub_test}_${to_tuned_setting}.out
+        fi
+
+        generate_ph_opts ${sub_test} ${test_option_override}
+        for iterations  in 1 `seq 2 1 ${to_times_to_run}`
+        do
+            ./phoronix-test-suite/phoronix-test-suite run ${sub_test} < /tmp/ph_opts  >> /tmp/results_${test_name}_${sub_test}_${to_tuned_setting}.out
+        done
+        #
+        # Archive up the results.
+        #
+        results_file=results_phoronix_${sub_test}.csv
+
+	cd /tmp
+	RESULTSDIR=results_${test_name}_${sub_test}_${to_tuned_setting}$(date "+%Y.%m.%d-%H.%M.%S")
+	mkdir -p ${RESULTSDIR}/${test_name}_${sub_test}_results/results_phoronix
+	if [[ -f results_${test_name}_${sub_test}_${to_tuned_setting} ]]; then
+		rm results_${test_name}_${sub_test}_${to_tuned_setting}
 	fi
-	for iterations  in 1 `seq 2 1 ${to_times_to_run}`
-	do
-		./phoronix-test-suite/phoronix-test-suite run stress-ng < /tmp/ph_opts  >> /tmp/results_${test_name}_${to_tuned_setting}.out
-	done
+	ln -s ${RESULTSDIR} results_${test_name}_${sub_test}_${to_tuned_setting}
+
+	cp results_${test_name}_${sub_test}_*.out results_${test_name}_${sub_test}_${to_tuned_setting}/phoronix_results/results_phoronix
+	${curdir}/test_tools/move_data $curdir  results_${test_name}_${sub_test}_${to_tuned_setting}/phoronix_results/results_phoronix
+	cp /tmp/results_${test_name}_${sub_test}_${to_tuned_setting}.out results_${test_name}_${sub_test}_${to_tuned_setting}/phoronix_results/results_phoronix
+	pushd /tmp/results_${test_name}_${sub_test}_${to_tuned_setting}/phoronix_results/results_phoronix > /dev/null
+	$TOOLS_BIN/test_header_info --front_matter --results_file ${results_file} --host $to_configuration --sys_type $to_sys_type --tuned $to_tuned_setting --results_version $GIT_VERSION --test_name phoronix_${sub_test}
 	#
-	# Archive up the results.
+	# We place the results first in results_check.csv so we can check to make sure
+	# the tests actually ran.  After the check, we will add the run info to results.csv.
 	#
-	cd /tmp
-	RESULTSDIR=results_${test_name}_${to_tuned_setting}$(date "+%Y.%m.%d-%H.%M.%S")
-	mkdir -p ${RESULTSDIR}/${test_name}_results/results_phoronix
-	if [[ -f results_${test_name}_${to_tuned_setting} ]]; then
-		rm results_${test_name}_${to_tuned_setting}
-	fi
-	ln -s ${RESULTSDIR} results_${test_name}_${to_tuned_setting}
-
-	cp results_${test_name}_*.out results_${test_name}_${to_tuned_setting}/phoronix_results/results_phoronix
-	${curdir}/test_tools/move_data $curdir  results_${test_name}_${to_tuned_setting}/phoronix_results/results_phoronix
-	cp /tmp/results_${test_name}_${to_tuned_setting}.out results_${test_name}_${to_tuned_setting}/phoronix_results/results_phoronix
-	pushd /tmp/results_${test_name}_${to_tuned_setting}/phoronix_results/results_phoronix > /dev/null
-	$run_dir/reduce_phoronix > results.csv
-	lines=`wc -l results.csv | cut -d' ' -f 1`
+	$run_dir/reduce_phoronix --sub_test ${sub_test} --tmp_file results_${sub_test}_check.csv
+	lines=`wc -l results_${sub_test}_check.csv | cut -d' ' -f 1`
 	if [[ $lines == "1" ]]; then
+		#
+		# We failed, report and do not remove the results_{sub_test}_check.csv file.
+		#
 		echo Failed >> test_results_report
+		rtc=1
 	else
 		echo Ran >> test_results_report
+		cat results_${sub_test}_check.csv >> ${results_file}
+		rm results_${sub_test}_check.csv
 	fi
 	popd > /dev/null
-	find -L results_${test_name}_${to_tuned_setting}  -type f | tar --transform 's/.*\///g' -cf results_pbench.tar --files-from=/dev/stdin
-	tar hcf results_${test_name}_${to_tuned_setting}.tar results_${test_name}_${to_tuned_setting}
+	find -L $RESULTSDIR  -type f | tar --transform 's/.*\///g' -cf results_pbench.tar --files-from=/dev/stdin
+	${curdir}/test_tools/save_results --curdir $curdir --home_root $to_home_root --copy_dir $RESULTSDIR --test_name $test_name --tuned_setting=$to_tuned_setting --version $version none --user $to_user
+
 fi
-exit 0
+exit $rtc
diff --git a/phoronix/test_index.yaml b/phoronix/test_index.yaml
new file mode 100644
index 0000000..e9e2011
--- /dev/null
+++ b/phoronix/test_index.yaml
@@ -0,0 +1,33 @@
+subtests:
+  openssl:
+    description: "OpenSSL"
+    options:
+      algorithm:
+        1. "RSA4096"
+        2. "SHA256"
+        3. "SHA512"
+        4. "AES-128-GCM"
+        5. "AES-256-GCM"
+        6. "ChaCha20"
+        7. "ChaCha20-Poly1305"
+        8. "Test All Options"
+      default_algorithm: "1"
+
+  cockroach:
+    description: "CockroachDB"
+    options:
+      workload:
+        1. "KV, 95% Reads"
+        2. "KV, 50% Reads"
+        3. "KV, 60% Reads"
+        4. "KV, 10% Reads"
+        5. "MoVR"
+        6. "Test All Options"
+      concurrency:
+        1. "128"
+        2. "256"
+        3. "512"
+        4. "1024"
+        5. "Test_All_Options"
+      default_workload: "1"
+      default_concurrency: "1"
\ No newline at end of file