diff --git a/.gitmodules b/.gitmodules
index 3801969..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "aerpaw/aerpawlib"]
-	path = aerpaw/aerpawlib
-	url = https://github.com/morzack/aerpawlib-vehicle-control.git
diff --git a/aerpaw/aerpawlib b/aerpaw/aerpawlib
deleted file mode 160000
index 705fc69..0000000
--- a/aerpaw/aerpawlib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 705fc699eff896ceea073d1e65f7d8bc549377c7
diff --git a/aerpaw/scripts/startRadio.sh b/aerpaw/scripts/startRadio.sh
new file mode 100755
index 0000000..555f874
--- /dev/null
+++ b/aerpaw/scripts/startRadio.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+#RX
+
+cd $PROFILE_DIR"/ProfileScripts/Radio/Helpers"
+
+screen -S rxGRC -dm \
+       bash -c "stdbuf -oL -eL ./startchannelsounderRXGRC.sh \
+       2>&1 | ts $TS_FORMAT \
+       | tee $RESULTS_DIR/$LOG_PREFIX\_radio_channelsounderrxgrc_log.txt"
+
+screen -S power -dm        bash -c "stdbuf -oL -eL tail -F /root/Power\
+        2>&1 | ts $TS_FORMAT \
+       | tee $RESULTS_DIR/$LOG_PREFIX\_power_log.txt"
+
+screen -S quality -dm        bash -c "stdbuf -oL -eL tail -F /root/Quality\
+        2>&1 | ts $TS_FORMAT \
+       | tee $RESULTS_DIR/$LOG_PREFIX\_quality_log.txt"
+
+screen -S snr -dm        bash -c "stdbuf -oL -eL tail -F /root/SNR\
+        2>&1 | ts $TS_FORMAT \
+       | tee $RESULTS_DIR/$LOG_PREFIX\_snr_log.txt"
+
+#TX
+
+screen -S txGRC -dm \
+       bash -c "stdbuf -oL -eL ./startchannelsounderTXGRC.sh \
+       2>&1 | ts $TS_FORMAT \
+       | tee $RESULTS_DIR/$LOG_PREFIX\_radio_channelsoundertxgrc_log.txt"
+cd -
diff --git a/aerpaw/scripts/startVehicle.sh b/aerpaw/scripts/startVehicle.sh
new file mode 100755
index 0000000..b95cdc1
--- /dev/null
+++ b/aerpaw/scripts/startVehicle.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+### Sample GPS logger portion
+# use vehicle type generic to skip the arming requirement
+export VEHICLE_TYPE="${VEHICLE_TYPE:-generic}"
+
+# GPS Logger sample application (this does not move the vehicle)
+
+#cd $PROFILE_DIR"/ProfileScripts/Vehicle/Helpers"
+#
+#screen -S vehicle -dm \
+#       bash -c "stdbuf -oL -eL ./gpsLoggerHelper.sh \
+#       2> >(ts $TS_FORMAT >> $RESULTS_DIR/${LOG_PREFIX}_vehicle_log_err.txt) \
+#       | ts $TS_FORMAT \
+#       | tee $RESULTS_DIR/$LOG_PREFIX\_vehicle_log.txt"
+#
+#cd -
+
+### Actual control portion (custom)
+export VEHICLE_TYPE="${VEHICLE_TYPE:-drone}" # out of rover, drone, generic
+
+cd /root/miSim/aerpaw
+
+# Use screen/ts/tee aerpawism from sample script
+screen -S vehicle -dm \
+       bash -c "stdbuf -oL -eL ./run_uav.sh testbed /root/miSim/aerpaw/config/client1.yaml \
+       | ts $TS_FORMAT \
+       | tee $RESULTS_DIR/$LOG_PREFIX\_vehicle_log.txt"     
+
+cd -
diff --git a/aerpaw/scripts/startexperiment.sh b/aerpaw/scripts/startexperiment.sh
new file mode 100755
index 0000000..c77b29d
--- /dev/null
+++ b/aerpaw/scripts/startexperiment.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+/root/stopexperiment.sh
+
+source /root/.ap-set-experiment-env.sh
+source /root/.bashrc
+
+# set path to client config YAML
+export AERPAW_CLIENT_CONFIG=/root/miSim/aerpaw/config/client1.yaml
+
+export AERPAW_REPO=${AERPAW_REPO:-/root/AERPAW-Dev}
+export AERPAW_PYTHON=${AERPAW_PYTHON:-python3}
+export PYTHONPATH=/usr/local/lib/python3/dist-packages/
+export EXP_NUMBER=${EXP_NUMBER:-1}
+
+if [ "$AP_EXPENV_THIS_CONTAINER_NODE_VEHICLE" == "vehicle_uav" ]; then
+    export VEHICLE_TYPE=drone
+elif [ "$AP_EXPENV_THIS_CONTAINER_NODE_VEHICLE" == "vehicle_ugv" ]; then
+    export VEHICLE_TYPE=rover
+else
+    export VEHICLE_TYPE=none
+fi
+
+if [ "$AP_EXPENV_SESSION_ENV" == "Virtual" ]; then
+    export LAUNCH_MODE=EMULATION
+elif [ "$AP_EXPENV_SESSION_ENV" == "Testbed" ]; then
+    export LAUNCH_MODE=TESTBED
+else
+    export LAUNCH_MODE=none
+fi
+
+# prepare results directory
+export UAV_ID=$(python3 -c "import yaml; print(yaml.safe_load(open('$AERPAW_CLIENT_CONFIG'))['uav_id'])")
+export RESULTS_DIR_TIMESTAMP=$(date +%Y-%m-%d_%H_%M_%S)
+export RESULTS_DIR="/root/Results/uav${UAV_ID}_${RESULTS_DIR_TIMESTAMP}"
+mkdir -p "$RESULTS_DIR"
+
+export TS_FORMAT="${TS_FORMAT:-'[%Y-%m-%d %H:%M:%.S]'}"
+export LOG_PREFIX="$(date +%Y-%m-%d_%H_%M_%S)"
+
+export TX_FREQ=3.32e9
+export RX_FREQ=3.32e9
+
+
+export PROFILE_DIR=$AERPAW_REPO"/AHN/E-VM/Profile_software"
+cd $PROFILE_DIR"/ProfileScripts"
+
+
+
+./Radio/startRadio.sh
+#./Traffic/startTraffic.sh
+./Vehicle/startVehicle.sh
+
+schedule_stop.sh 30
diff --git a/t1.zip b/t1.zip
deleted file mode 100644
index fe02327..0000000
Binary files a/t1.zip and /dev/null differ