diff --git a/.gdbinit b/.gdbinit
index 676e54df9..782f9c256 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -1,6 +1,7 @@
 tar rem:3333
 file wolfboot.elf
-add-symbol-file test-app/image.elf
+#add-symbol-file test-app/image.elf
+add-symbol-file /home/dan/src/wolfboot/IDE/MPLabX/wolfBoot_usbUpdateApp.X/dist/default/production/wolfBoot_usbUpdateApp.X.production.elf
 foc c
 
 
diff --git a/IDE/MPLabX/wolfBoot-SAME51.X/nbproject/private/private.xml b/IDE/MPLabX/wolfBoot-SAME51.X/nbproject/private/private.xml
index 2f181babe..18a01a329 100644
--- a/IDE/MPLabX/wolfBoot-SAME51.X/nbproject/private/private.xml
+++ b/IDE/MPLabX/wolfBoot-SAME51.X/nbproject/private/private.xml
@@ -3,24 +3,11 @@
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/home/dan/src/wolfboot/hal/same51.c</file>
             <file>file:/home/dan/src/wolfboot/include/target.h</file>
             <file>file:/home/dan/src/wolfboot/include/image.h</file>
             <file>file:/home/dan/src/wolfboot/include/loader.h</file>
-            <file>file:/home/dan/src/wolfboot/src/update_flash.c</file>
-            <file>file:/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot_usbUpdateApp.X/startup_same51j20a.c</file>
-            <file>file:/home/dan/src/wolfboot/src/loader.c</file>
-            <file>file:/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot-SAME51.X/Makefile</file>
-            <file>file:/home/dan/src/wolfboot/hal/same51.ld</file>
-            <file>file:/home/dan/src/wolfboot/src/image.c</file>
-            <file>file:/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot_usbUpdateApp.X/same51j20a_flash.ld</file>
-            <file>file:/home/dan/src/wolfboot/src/string.c</file>
-            <file>file:/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot_usbUpdateApp.X/system_same51j20a.c</file>
             <file>file:/home/dan/src/wolfboot/include/wolfboot/wolfboot.h</file>
-            <file>file:/home/dan/src/wolfboot/src/libwolfboot.c</file>
-            <file>file:/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot_usbUpdateApp.X/main.c</file>
-            <file>file:/home/dan/src/wolfboot/src/keystore.c</file>
-            <file>file:/home/dan/src/wolfboot/src/update_flash_hwswap.c</file>
+            <file>file:/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot-SAME51.X/Makefile</file>
         </group>
     </open-files>
 </project-private>
diff --git a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/main.c b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/main.c
index ecdb3c112..93b0a26d2 100644
--- a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/main.c
+++ b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/main.c
@@ -7,11 +7,14 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "wolfboot/wolfboot.h"
+
 
 /*
  * 
  */
 int main(int argc, char** argv) {
+    wolfBoot_success();
     
     while (1)
         asm volatile ("wfi");
diff --git a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-default.mk b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-default.mk
index a1bcb08fa..4e8c8c43c 100644
--- a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-default.mk
+++ b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-default.mk
@@ -51,17 +51,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
 DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
 
 # Source Files Quoted if spaced
-SOURCEFILES_QUOTED_IF_SPACED=startup_same51j20a.c system_same51j20a.c main.c
+SOURCEFILES_QUOTED_IF_SPACED=startup_same51j20a.c system_same51j20a.c main.c ../../../src/libwolfboot.c ../../../hal/same51.c
 
 # Object Files Quoted if spaced
-OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/startup_same51j20a.o ${OBJECTDIR}/system_same51j20a.o ${OBJECTDIR}/main.o
-POSSIBLE_DEPFILES=${OBJECTDIR}/startup_same51j20a.o.d ${OBJECTDIR}/system_same51j20a.o.d ${OBJECTDIR}/main.o.d
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/startup_same51j20a.o ${OBJECTDIR}/system_same51j20a.o ${OBJECTDIR}/main.o ${OBJECTDIR}/_ext/1386528437/libwolfboot.o ${OBJECTDIR}/_ext/1386517348/same51.o
+POSSIBLE_DEPFILES=${OBJECTDIR}/startup_same51j20a.o.d ${OBJECTDIR}/system_same51j20a.o.d ${OBJECTDIR}/main.o.d ${OBJECTDIR}/_ext/1386528437/libwolfboot.o.d ${OBJECTDIR}/_ext/1386517348/same51.o.d
 
 # Object Files
-OBJECTFILES=${OBJECTDIR}/startup_same51j20a.o ${OBJECTDIR}/system_same51j20a.o ${OBJECTDIR}/main.o
+OBJECTFILES=${OBJECTDIR}/startup_same51j20a.o ${OBJECTDIR}/system_same51j20a.o ${OBJECTDIR}/main.o ${OBJECTDIR}/_ext/1386528437/libwolfboot.o ${OBJECTDIR}/_ext/1386517348/same51.o
 
 # Source Files
-SOURCEFILES=startup_same51j20a.c system_same51j20a.c main.c
+SOURCEFILES=startup_same51j20a.c system_same51j20a.c main.c ../../../src/libwolfboot.c ../../../hal/same51.c
 
 # Pack Options 
 PACK_COMMON_OPTIONS=-I "${DFP_DIR}/include"  -I "${CMSIS_DIR}/CMSIS/Core/Include"
@@ -103,42 +103,66 @@ endif
 # ------------------------------------------------------------------------------------
 # Rules for buildStep: compile
 ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-${OBJECTDIR}/startup_same51j20a.o: startup_same51j20a.c  .generated_files/flags/default/266835027f1c66a22b2cebc9ad2a636c2acd2834 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
+${OBJECTDIR}/startup_same51j20a.o: startup_same51j20a.c  .generated_files/flags/default/227bf08d8249cfdb3a1dd412eeadf59e1f401bdb .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
 	@${MKDIR} "${OBJECTDIR}" 
 	@${RM} ${OBJECTDIR}/startup_same51j20a.o.d 
 	@${RM} ${OBJECTDIR}/startup_same51j20a.o 
-	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4 -g -D__DEBUG  -gdwarf-2  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/startup_same51j20a.o.d" -o ${OBJECTDIR}/startup_same51j20a.o startup_same51j20a.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4 -g -D__DEBUG  -gdwarf-2  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb -I "../../../include" ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/startup_same51j20a.o.d" -o ${OBJECTDIR}/startup_same51j20a.o startup_same51j20a.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
 	
-${OBJECTDIR}/system_same51j20a.o: system_same51j20a.c  .generated_files/flags/default/ba387db6506ddb8f987a69df1a74ec0d3eef8db3 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
+${OBJECTDIR}/system_same51j20a.o: system_same51j20a.c  .generated_files/flags/default/37cc62d7e3d8803d2f03966ac2486806abba6ed8 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
 	@${MKDIR} "${OBJECTDIR}" 
 	@${RM} ${OBJECTDIR}/system_same51j20a.o.d 
 	@${RM} ${OBJECTDIR}/system_same51j20a.o 
-	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4 -g -D__DEBUG  -gdwarf-2  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/system_same51j20a.o.d" -o ${OBJECTDIR}/system_same51j20a.o system_same51j20a.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4 -g -D__DEBUG  -gdwarf-2  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb -I "../../../include" ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/system_same51j20a.o.d" -o ${OBJECTDIR}/system_same51j20a.o system_same51j20a.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
 	
-${OBJECTDIR}/main.o: main.c  .generated_files/flags/default/49e09785ee8b5e59c6bdfea009ff02a2c195819 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
+${OBJECTDIR}/main.o: main.c  .generated_files/flags/default/4b883f0a456f349c7fe2f514cc539a0f0c919e54 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
 	@${MKDIR} "${OBJECTDIR}" 
 	@${RM} ${OBJECTDIR}/main.o.d 
 	@${RM} ${OBJECTDIR}/main.o 
-	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4 -g -D__DEBUG  -gdwarf-2  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/main.o.d" -o ${OBJECTDIR}/main.o main.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4 -g -D__DEBUG  -gdwarf-2  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb -I "../../../include" ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/main.o.d" -o ${OBJECTDIR}/main.o main.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
+	
+${OBJECTDIR}/_ext/1386528437/libwolfboot.o: ../../../src/libwolfboot.c  .generated_files/flags/default/8b2bb306f3cc0d6937fe247a82c65e4cfe2266a0 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
+	@${MKDIR} "${OBJECTDIR}/_ext/1386528437" 
+	@${RM} ${OBJECTDIR}/_ext/1386528437/libwolfboot.o.d 
+	@${RM} ${OBJECTDIR}/_ext/1386528437/libwolfboot.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4 -g -D__DEBUG  -gdwarf-2  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb -I "../../../include" ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/_ext/1386528437/libwolfboot.o.d" -o ${OBJECTDIR}/_ext/1386528437/libwolfboot.o ../../../src/libwolfboot.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
+	
+${OBJECTDIR}/_ext/1386517348/same51.o: ../../../hal/same51.c  .generated_files/flags/default/d16e0c50d565fb975f3e7325c0883f0d30ab13d0 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
+	@${MKDIR} "${OBJECTDIR}/_ext/1386517348" 
+	@${RM} ${OBJECTDIR}/_ext/1386517348/same51.o.d 
+	@${RM} ${OBJECTDIR}/_ext/1386517348/same51.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4 -g -D__DEBUG  -gdwarf-2  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb -I "../../../include" ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/_ext/1386517348/same51.o.d" -o ${OBJECTDIR}/_ext/1386517348/same51.o ../../../hal/same51.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
 	
 else
-${OBJECTDIR}/startup_same51j20a.o: startup_same51j20a.c  .generated_files/flags/default/9f4b4bd2f996ada19fbde8c04519e12d0d1596b8 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
+${OBJECTDIR}/startup_same51j20a.o: startup_same51j20a.c  .generated_files/flags/default/8359dfa65ced3fc08a65768a20be9b8f4f59f0bc .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
 	@${MKDIR} "${OBJECTDIR}" 
 	@${RM} ${OBJECTDIR}/startup_same51j20a.o.d 
 	@${RM} ${OBJECTDIR}/startup_same51j20a.o 
-	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/startup_same51j20a.o.d" -o ${OBJECTDIR}/startup_same51j20a.o startup_same51j20a.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb -I "../../../include" ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/startup_same51j20a.o.d" -o ${OBJECTDIR}/startup_same51j20a.o startup_same51j20a.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
 	
-${OBJECTDIR}/system_same51j20a.o: system_same51j20a.c  .generated_files/flags/default/39fd1a6cdcc4067182b19e40e5b25cd58230930f .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
+${OBJECTDIR}/system_same51j20a.o: system_same51j20a.c  .generated_files/flags/default/25414ef865ff4887ff2ba1c951132cf553dce327 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
 	@${MKDIR} "${OBJECTDIR}" 
 	@${RM} ${OBJECTDIR}/system_same51j20a.o.d 
 	@${RM} ${OBJECTDIR}/system_same51j20a.o 
-	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/system_same51j20a.o.d" -o ${OBJECTDIR}/system_same51j20a.o system_same51j20a.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb -I "../../../include" ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/system_same51j20a.o.d" -o ${OBJECTDIR}/system_same51j20a.o system_same51j20a.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
 	
-${OBJECTDIR}/main.o: main.c  .generated_files/flags/default/eebcae32a2b5f7279a7c29803829db2b62fbbd1b .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
+${OBJECTDIR}/main.o: main.c  .generated_files/flags/default/6660876d8b57ca1dba5af5cabdc4f438004043a4 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
 	@${MKDIR} "${OBJECTDIR}" 
 	@${RM} ${OBJECTDIR}/main.o.d 
 	@${RM} ${OBJECTDIR}/main.o 
-	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/main.o.d" -o ${OBJECTDIR}/main.o main.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb -I "../../../include" ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/main.o.d" -o ${OBJECTDIR}/main.o main.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
+	
+${OBJECTDIR}/_ext/1386528437/libwolfboot.o: ../../../src/libwolfboot.c  .generated_files/flags/default/1365789152c7cd40f3031ed411ba9e3b0891e067 .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
+	@${MKDIR} "${OBJECTDIR}/_ext/1386528437" 
+	@${RM} ${OBJECTDIR}/_ext/1386528437/libwolfboot.o.d 
+	@${RM} ${OBJECTDIR}/_ext/1386528437/libwolfboot.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb -I "../../../include" ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/_ext/1386528437/libwolfboot.o.d" -o ${OBJECTDIR}/_ext/1386528437/libwolfboot.o ../../../src/libwolfboot.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
+	
+${OBJECTDIR}/_ext/1386517348/same51.o: ../../../hal/same51.c  .generated_files/flags/default/38a43373eea8173c482685a440dc93188d64817b .generated_files/flags/default/da39a3ee5e6b4b0d3255bfef95601890afd80709
+	@${MKDIR} "${OBJECTDIR}/_ext/1386517348" 
+	@${RM} ${OBJECTDIR}/_ext/1386517348/same51.o.d 
+	@${RM} ${OBJECTDIR}/_ext/1386517348/same51.o 
+	${MP_CC}  $(MP_EXTRA_CC_PRE) -mcpu=cortex-m4  -x c -c -D__$(MP_PROCESSOR_OPTION)__  -mthumb -I "../../../include" ${PACK_COMMON_OPTIONS}  -Os -ffunction-sections -mlong-calls -Wall -MP -MMD -MF "${OBJECTDIR}/_ext/1386517348/same51.o.d" -o ${OBJECTDIR}/_ext/1386517348/same51.o ../../../hal/same51.c  -DXPRJ_default=$(CND_CONF)  $(COMPARISON_BUILD) 
 	
 endif
 
diff --git a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-genesis.properties b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-genesis.properties
index 8b2eabd7e..4a4bea88a 100644
--- a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-genesis.properties
+++ b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-genesis.properties
@@ -1,12 +1,12 @@
 #
-#Thu Jan 18 11:39:43 CET 2024
+#Thu Jan 18 15:10:16 CET 2024
 default.languagetoolchain.version=12.2.1
 default.com-microchip-mplab-nbide-toolchain-arm-ARMLanguageToolchain.md5=c33efee51d7853b82066e227bca20492
 default.Pack.dfplocation=/opt/microchip/mplabx/v6.15/packs/Microchip/SAME51_DFP/3.7.242
 conf.ids=default
 default.languagetoolchain.dir=/usr/bin
 host.id=130a-gnot-23
-configurations-xml=f236b96cf6f4f80083dfa8c84d6eb609
+configurations-xml=7eafda18e0c159c9ccbe22544f660f14
 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=e62346c0c0ecee2637e613b49cb7b7fa
 default.com-microchip-mplab-mdbcore-JLink-JLinkImpl.md5=09370ac9c9e001d99845a6c8b21609d2
 proj.dir=/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot_usbUpdateApp.X
diff --git a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-local-default.mk b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-local-default.mk
index ad8a9bfa9..56ff4ba7c 100644
--- a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-local-default.mk
+++ b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/Makefile-local-default.mk
@@ -33,5 +33,5 @@ MP_CPPC_DIR="/usr/bin"
 MP_AS_DIR="/usr/bin"
 MP_LD_DIR="/usr/bin"
 MP_AR_DIR="/usr/bin"
-DFP_DIR=/opt/microchip/mplabx/v6.15/packs/Microchip/SAME51_DFP/3.7.242
 CMSIS_DIR=/opt/microchip/mplabx/v6.15/packs/arm/CMSIS/5.4.0
+DFP_DIR=/opt/microchip/mplabx/v6.15/packs/Microchip/SAME51_DFP/3.7.242
diff --git a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/configurations.xml b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/configurations.xml
index 423b1cf9d..e847c80f4 100644
--- a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/configurations.xml
+++ b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/configurations.xml
@@ -16,6 +16,8 @@
       <itemPath>startup_same51j20a.c</itemPath>
       <itemPath>system_same51j20a.c</itemPath>
       <itemPath>main.c</itemPath>
+      <itemPath>../../../src/libwolfboot.c</itemPath>
+      <itemPath>../../../hal/same51.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -23,6 +25,10 @@
       <itemPath>Makefile</itemPath>
     </logicalFolder>
   </logicalFolder>
+  <sourceRootList>
+    <Elem>../../../src</Elem>
+    <Elem>../../../hal</Elem>
+  </sourceRootList>
   <projectmakefile>Makefile</projectmakefile>
   <confs>
     <conf name="default" type="2">
@@ -37,8 +43,8 @@
         <platform>2</platform>
       </toolsSet>
       <packs>
-        <pack name="SAME51_DFP" vendor="Microchip" version="3.7.242"/>
         <pack name="CMSIS" vendor="ARM" version="5.4.0"/>
+        <pack name="SAME51_DFP" vendor="Microchip" version="3.7.242"/>
       </packs>
       <ScriptingSettings>
       </ScriptingSettings>
@@ -137,7 +143,7 @@
       </ARM-GCC>
       <ARM-Global>
         <property key="bin" value="false"/>
-        <property key="common-include-directories" value=""/>
+        <property key="common-include-directories" value="../../../include"/>
         <property key="eep" value="false"/>
         <property key="hex" value="true"/>
         <property key="lss" value="false"/>
@@ -165,6 +171,76 @@
         <property key="sram-segment" value=""/>
         <property key="unsafe-math" value="false"/>
       </ARM-LD>
+      <Tool>
+        <property key="AutoSelectMemRanges" value="auto"/>
+        <property key="arm.use_vtor" value="false"/>
+        <property key="arm.vtor_adr" value="exception_table"/>
+        <property key="communication.adaptivespeed" value="false"/>
+        <property key="communication.autoselectspeed" value="true"/>
+        <property key="communication.interface" value="swd"/>
+        <property key="communication.speed" value="4"/>
+        <property key="debugoptions.debug-startup" value="Use system settings"/>
+        <property key="debugoptions.reset-behaviour" value="Use system settings"/>
+        <property key="event.recorder.enabled" value="false"/>
+        <property key="event.recorder.scvd.files" value=""/>
+        <property key="jlink.override" value=""/>
+        <property key="lastid" value=""/>
+        <property key="loader.board_file" value="${ProjectDir}/board.xboard"/>
+        <property key="memories.bootflash" value="true"/>
+        <property key="memories.configurationmemory" value="true"/>
+        <property key="memories.eeprom" value="true"/>
+        <property key="memories.id" value="true"/>
+        <property key="memories.instruction.ram" value="true"/>
+        <property key="memories.instruction.ram.ranges"
+                  value="${memories.instruction.ram.ranges.default}"/>
+        <property key="memories.programmemory" value="true"/>
+        <property key="memories.programmemory.ranges" value="0x0-0xfffff"/>
+        <property key="programoptions.eraseb4program" value="false"/>
+        <property key="programoptions.preservebootflash" value="false"/>
+        <property key="programoptions.preserveprogrammemory" value="false"/>
+        <property key="programoptions.preserveprogramrange.ranges" value="0x0-0xfffff"/>
+        <property key="programoptions.resetafterprogram" value="true"/>
+        <property key="script.has_reset" value="true"/>
+        <property key="script.log_level" value="1"/>
+        <property key="script.reset_delay" value="0"/>
+        <property key="script.show_output" value="false"/>
+        <property key="x.erase.clearprot" value="true"/>
+      </Tool>
+      <jlink>
+        <property key="AutoSelectMemRanges" value="auto"/>
+        <property key="arm.use_vtor" value="false"/>
+        <property key="arm.vtor_adr" value="exception_table"/>
+        <property key="communication.adaptivespeed" value="false"/>
+        <property key="communication.autoselectspeed" value="true"/>
+        <property key="communication.interface" value="swd"/>
+        <property key="communication.speed" value="4"/>
+        <property key="debugoptions.debug-startup" value="Use system settings"/>
+        <property key="debugoptions.reset-behaviour" value="Use system settings"/>
+        <property key="event.recorder.enabled" value="false"/>
+        <property key="event.recorder.scvd.files" value=""/>
+        <property key="jlink.override" value=""/>
+        <property key="lastid" value=""/>
+        <property key="loader.board_file" value="${ProjectDir}/board.xboard"/>
+        <property key="memories.bootflash" value="true"/>
+        <property key="memories.configurationmemory" value="true"/>
+        <property key="memories.eeprom" value="true"/>
+        <property key="memories.id" value="true"/>
+        <property key="memories.instruction.ram" value="true"/>
+        <property key="memories.instruction.ram.ranges"
+                  value="${memories.instruction.ram.ranges.default}"/>
+        <property key="memories.programmemory" value="true"/>
+        <property key="memories.programmemory.ranges" value="0x0-0xfffff"/>
+        <property key="programoptions.eraseb4program" value="false"/>
+        <property key="programoptions.preservebootflash" value="false"/>
+        <property key="programoptions.preserveprogrammemory" value="false"/>
+        <property key="programoptions.preserveprogramrange.ranges" value="0x0-0xfffff"/>
+        <property key="programoptions.resetafterprogram" value="true"/>
+        <property key="script.has_reset" value="true"/>
+        <property key="script.log_level" value="1"/>
+        <property key="script.reset_delay" value="0"/>
+        <property key="script.show_output" value="false"/>
+        <property key="x.erase.clearprot" value="true"/>
+      </jlink>
     </conf>
   </confs>
 </configurationDescriptor>
diff --git a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/private/private.xml b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/private/private.xml
index 6807a2ba1..0853fcaf9 100644
--- a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/private/private.xml
+++ b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/private/private.xml
@@ -2,6 +2,20 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group/>
+        <group>
+            <file>file:/home/dan/src/wolfboot/hal/same51.c</file>
+            <file>file:/home/dan/src/wolfboot/src/update_flash.c</file>
+            <file>file:/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot_usbUpdateApp.X/startup_same51j20a.c</file>
+            <file>file:/home/dan/src/wolfboot/src/loader.c</file>
+            <file>file:/home/dan/src/wolfboot/hal/same51.ld</file>
+            <file>file:/home/dan/src/wolfboot/src/image.c</file>
+            <file>file:/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot_usbUpdateApp.X/same51j20a_flash.ld</file>
+            <file>file:/home/dan/src/wolfboot/src/string.c</file>
+            <file>file:/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot_usbUpdateApp.X/system_same51j20a.c</file>
+            <file>file:/home/dan/src/wolfboot/src/libwolfboot.c</file>
+            <file>file:/home/dan/src/wolfboot/IDE/MPLabX/wolfBoot_usbUpdateApp.X/main.c</file>
+            <file>file:/home/dan/src/wolfboot/src/keystore.c</file>
+            <file>file:/home/dan/src/wolfboot/src/update_flash_hwswap.c</file>
+        </group>
     </open-files>
 </project-private>
diff --git a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/project.xml b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/project.xml
index e508d4866..d71da4616 100644
--- a/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/project.xml
+++ b/IDE/MPLabX/wolfBoot_usbUpdateApp.X/nbproject/project.xml
@@ -8,7 +8,10 @@
             <make-project-type>0</make-project-type>
             <sourceEncoding>ISO-8859-1</sourceEncoding>
             <make-dep-projects/>
-            <sourceRootList/>
+            <sourceRootList>
+                <sourceRootElem>../../../src</sourceRootElem>
+                <sourceRootElem>../../../hal</sourceRootElem>
+            </sourceRootList>
             <confList>
                 <confElem>
                     <name>default</name>