diff --git a/src/ACATResources/ACATResources.csproj b/src/ACATResources/ACATResources.csproj
index 74db04e2..05319205 100644
--- a/src/ACATResources/ACATResources.csproj
+++ b/src/ACATResources/ACATResources.csproj
@@ -66,95 +66,95 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="en\KeyboardABCUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardEditUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardLockUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardModesUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardNumberNumericKeypadUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardYesNoUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\MenuUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\NumericUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\PhrasesUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\TalkApplicationBCIScannerNewUI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\TTSYesNoUserControlBCI2.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlContainerForm.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlScreenLock.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlDefaultTryout.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardAbcUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\ScanTimeAdjustForm.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlTalkInterfaceDesc.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\WordPredictionSetModeScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardNumbersUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardEditUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\MainMenu.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\SentencePredictionUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\KeyboardQwertyUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\PanelConfigMap.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
       <SubType>Designer</SubType>
     </Content>
     <Content Include="en\TalkApplicationScannerQwerty.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\UserControlConfigMap.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\WordPredictionUserControl.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\WordPredictionUserControlBCI.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\YesNoResponseScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="en\YesNoScanner.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj b/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj
index 52511939..c71b3754 100644
--- a/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj
+++ b/src/Extensions/Default/Actuators/CameraActuator/CameraActuator.csproj
@@ -38,7 +38,7 @@
     <DefineConstants>TRACE;ENABLE_DIGITAL_VERIFICATION</DefineConstants>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-        <ErrorReport>prompt</ErrorReport>
+    <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
@@ -132,154 +132,152 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="External\acat_gestures.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <Content Include="External\acat_gestures.exe" />
     <Content Include="External\acat_gestures_dll.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\acat_gestures_dll_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libinfra.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libinfra_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libivcp.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libivcp_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libpipeline.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\libpipeline_d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\msvcp110.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\msvcr110.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_calib3d2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_calib3d2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_contrib2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_contrib2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_core2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_core2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_features2d2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_features2d2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ffmpeg2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_flann2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_flann2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_gpu2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_gpu2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_highgui2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_highgui2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_imgproc2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_imgproc2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_legacy2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_legacy2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ml2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ml2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_nonfree2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_nonfree2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_objdetect2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_objdetect2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ocl2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_ocl2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_photo2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_photo2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_stitching2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_stitching2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_superres2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_superres2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_video2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_video2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_videostab2413.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
     <Content Include="External\opencv_videostab2413d.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </Content>
   </ItemGroup>
   <ItemGroup>
     <None Include="External\shape_predictor_68_face_landmarks.dat">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      
     </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/deploy.bat b/src/deploy.bat
index e7f9f59d..98f22aa1 100644
--- a/src/deploy.bat
+++ b/src/deploy.bat
@@ -1,17 +1,37 @@
-rem @echo off
+@echo off
 
 set CONFIG=%2
+
+if "%CONFIG%"=="" (
+	echo "ERROR: No configuration specified. Please specify Debug or Release."
+	echo "Usage: deploy.bat <path to ACAT root> <Debug|Release>"
+	exit /b 1
+)
+if "%CONFIG%"=="Debug" (
+	echo Deploying Debug configuration
+) else if "%CONFIG%"=="Release" (
+	echo Deploying Release configuration
+) else (
+	echo "ERROR: Invalid configuration specified. Please specify Debug or Release."
+	echo "Usage: deploy.bat <path to ACAT root> <Debug|Release>"
+	exit /b 1
+)
 set INSTALLDIR=.\Applications\ACATApp\bin\%CONFIG%
 
+echo Deploying ACAT to %INSTALLDIR%
 cd %1
 
+echo Current Directory is %CD%
+
+
 rem ------------------------------------------------
 @echo Deploying Install files
 rem ------------------------------------------------
 
-set SOURCEDIR=Applications\Install\Users
-set TARGETDIR=%INSTALLDIR%\Install\Users
-xcopy /s /y /e /i %SOURCEDIR%\*.* %TARGETDIR% 
+set SOURCEDIR=Applications\Install\Users\
+set TARGETDIR=%INSTALLDIR%\Install\Users\
+call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 set LANGUAGE=en
 
@@ -19,9 +39,10 @@ set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\WordPredictors\ConvAssist
 set SOURCEDIR=Applications\Install\%LANGUAGE%\WordPredictors\ConvAssist
 if not exist %SOURCEDIR% (
 	echo ERROR: %SOURCEDIR% does not exist
-	goto DeployConvAssist
+	exit /b 1
 )
-xcopy /s /y /e /i %SOURCEDIR%\*.* %TARGETDIR% 
+call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying ConvAssist
@@ -38,15 +59,17 @@ if not exist %TARGETDIR% (
 if not exist %SOURCEDIR%\ConvAssist\ (
 	powershell -Command "Expand-Archive -Force -Path %SOURCEDIR%\ConvAssist.zip -Destination %SOURCEDIR%\ConvAssist"
 )
-xcopy /s /y /e /i %SOURCEDIR%\ConvAssist\* %TARGETDIR%
+call :safe_xcopy /s /y /e /i %SOURCEDIR%\ConvAssist\* %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 :DeployAssets
 rem ------------------------------------------------
 @echo Deploying Assets
 rem ------------------------------------------------
-set SOURCEDIR=Assets
+set SOURCEDIR=Assets\
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
-xcopy /s /y /e /i %SOURCEDIR%\*.* %TARGETDIR% 
+call :safe_xcopy %SOURCEDIR%\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying UI dlls
@@ -55,14 +78,19 @@ rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\UI\Scanners
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=Extensions\Default\UI\Menus
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\Menus.dll %TARGETDIR%
-copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\Menus.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+
+call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying English Language UI DLL's
@@ -73,48 +101,50 @@ set BASEDIR=Extensions\Default\UI
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\Scanners
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\Scanners
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
-
-rem goto Next
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 rem ------------------------------------------------
-@echo Actuators
+@echo Deploying Camera Actuator
 rem ------------------------------------------------
-
-set SOURCEDIR=Extensions\Default\Actuators\CameraActuator
+set SOURCEDIR=Extensions\Default\Actuators\CameraActuator\bin\%CONFIG%\
 set TARGETDIR=%INSTALLDIR%\Extensions\Default\Actuators\Camera
+echo TargetDir is %TARGETDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\CameraActuator.dll %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\*.exe %TARGETDIR%
-if exist .\%SOURCEDIR%\External goto CopyVisionExternal
-echo *** ERROR *** Could not find External dependencies for the Vision Actuator (.\%SOURCEDIR%\External).
-rem goto Next
-
-:CopyVisionExternal
-if not exist %TARGETDIR%\acat_gestures_dll.dll copy .\%SOURCEDIR%\External\*.* %TARGETDIR%
-if not exist %INSTALLDIR%\shape_predictor_68_face_landmarks.dat copy .\%SOURCEDIR%\External\shape_predictor_68_face_landmarks.dat %INSTALLDIR%
+call :safe_copy %SOURCEDIR%\CameraActuator.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
+set SOURCEDIR=Extensions\Default\Actuators\CameraActuator\External\
+call :safe_xcopy %SOURCEDIR% %TARGETDIR%
+if errorlevel 1 exit /b 1
+call :safe_copy .\%SOURCEDIR%shape_predictor_68_face_landmarks.dat %INSTALLDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying TTSEngine dlls
 rem ------------------------------------------------
-:Next
 set SOURCEDIR=Extensions\Default\TTSEngines\SAPIEngine
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\SAPIEngine.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\SAPIEngine.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=Extensions\Default\TTSEngines\TTSClient
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\TTSClient.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\TTSClient.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying SpellChecker dlls
@@ -123,7 +153,8 @@ rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\SpellCheckers\SpellCheck
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\SpellCheck.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\SpellCheck.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying AppAgents dlls
@@ -134,18 +165,24 @@ set EXTENSIONSBASE=Extensions\Default
 set SOURCEDIR=%EXTENSIONSBASE%\AppAgents\%AGENT%
 set TARGETDIR=%INSTALLDIR%\%EXTENSIONSBASE%\AppAgents\%AGENT%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
-if exist %SOURCEDIR%\*.xml copy %SOURCEDIR%\*.xml %TARGETDIR%
-if exist %SOURCEDIR%\Config\*.xml copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\*.xml call :safe_copy %SOURCEDIR%\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\Config\*.xml call :safe_copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set AGENT=TalkApplicationScannerAgent
 set EXTENSIONSBASE=Extensions\Default
 set SOURCEDIR=%EXTENSIONSBASE%\AppAgents\%AGENT%
 set TARGETDIR=%INSTALLDIR%\%EXTENSIONSBASE%\AppAgents\%AGENT%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
-if exist %SOURCEDIR%\*.xml copy %SOURCEDIR%\*.xml %TARGETDIR%
-if exist %SOURCEDIR%\Config\*.xml copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\%AGENT%.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\*.xml call :safe_copy %SOURCEDIR%\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist %SOURCEDIR%\Config\*.xml call :safe_copy %SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying ACAT WordPredictor dlls
@@ -154,7 +191,8 @@ rem ------------------------------------------------
 set SOURCEDIR=Extensions\Default\WordPredictors\ConvAssist
 set TARGETDIR=%INSTALLDIR%\%SOURCEDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying ACAT UserControls
@@ -164,8 +202,10 @@ rem ------------------------------------------------
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 
 rem ------------------------------------------------
@@ -176,7 +216,8 @@ set LANGUAGE=en
 set SOURCEDIR=ACATResources\bin\%CONFIG%\%LANGUAGE%
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\*.* %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\*.* %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 
 rem ------------------------------------------------
@@ -184,14 +225,16 @@ rem ------------------------------------------------
 rem ------------------------------------------------
 set SHARED_LIB_DIR=%INSTALLDIR%\SharedLibs
 if not exist %SHARED_LIB_DIR% mkdir %SHARED_LIB_DIR%
-copy Redistributable\*.*  %SHARED_LIB_DIR%
+call :safe_copy Redistributable\*.*  %SHARED_LIB_DIR%
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying Docs
 rem ------------------------------------------------
 set TARGETDIR=%INSTALLDIR%\Docs
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-xcopy /s /y /e /i Docs\*.* %TARGETDIR% 
+call :safe_xcopy Docs\*.* %TARGETDIR% 
+if errorlevel 1 exit /b 1
 
 rem ------------------------------------------------
 @echo Deploying BCI Extensions
@@ -199,21 +242,47 @@ rem ------------------------------------------------
 
 set SOURCEDIR=Extensions\BCI\Actuators\BCIActuator
 set BCIEXTERNALSRCDIR=Extensions\BCI\Actuators\External
+echo Install Dir is %INSTALLDIR%
 set TARGETDIR=%INSTALLDIR%\Extensions\BCI\Actuators\BCIActuator
+echo Target Dir is %TARGETDIR%
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-copy .\%BCIEXTERNALSRCDIR%\brainflow.5.5.0\*.dll %TARGETDIR%
+call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+call :safe_copy .\%BCIEXTERNALSRCDIR%\brainflow.5.5.0\*.dll %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set LANGUAGE=en
 set BASEDIR=Extensions\BCI\UI
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\Scanners
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\Scanners
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
 
 set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
 set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
 if not exist %TARGETDIR% mkdir %TARGETDIR%
-if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
-if exist .\%SOURCEDIR%\Config\*.xml copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
+if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
+if errorlevel 1 exit /b 1
+
+echo Completed deploying ACAT to %INSTALLDIR%
+exit /b 0
+
+:safe_copy
+copy %1 %2
+echo ERRORLEVEL is %errorlevel%
+if errorlevel 1 (
+    echo Failed to copy %1 to %2
+    exit /b 1
+)
+goto :eof
+
+:safe_xcopy
+xcopy /E /Y %1 %2
+echo ERRORLEVEL is %errorlevel%
+if errorlevel 1 (
+    echo Failed to xcopy from %1 to %2
+    exit /b 1
+)
+goto :eof