diff --git a/msvc/winConfig.bat b/msvc/winConfig.bat
index 8cb7feb..c6abd33 100644
--- a/msvc/winConfig.bat
+++ b/msvc/winConfig.bat
@@ -29,22 +29,6 @@ IF %ERRORLEVEL% NEQ 0 (
 	GOTO:EOF
 )
 echo on
-call msbuild.bat gc lib x64 Debug test
-echo off
-IF %ERRORLEVEL% NEQ 0 (
-	cd ..
-	PAUSE
-	GOTO:EOF
-)
-echo on
-call msbuild.bat gc lib x64 Debug tune
-echo off
-IF %ERRORLEVEL% NEQ 0 (
-	cd ..
-	PAUSE
-	GOTO:EOF
-)
-echo on
 call msbuild.bat gc lib x64 Release
 echo off
 IF %ERRORLEVEL% NEQ 0 (
@@ -53,48 +37,36 @@ IF %ERRORLEVEL% NEQ 0 (
 	GOTO:EOF
 )
 echo on
-call msbuild.bat gc lib x64 Release test
-echo off
-IF %ERRORLEVEL% NEQ 0 (
-	cd ..
-	PAUSE
-	GOTO:EOF
-)
-echo on
-call msbuild.bat gc lib x64 Release tune
-echo off
-IF %ERRORLEVEL% NEQ 0 (
-	cd ..
-	PAUSE
-	GOTO:EOF
-)
-echo on
-call msbuild.bat gc lib x64 Debug
-echo off
-IF %ERRORLEVEL% NEQ 0 (
-	cd ..
-	PAUSE
-	GOTO:EOF
-)
-echo on
 cd ..\..\..
-cd wxWidgets\build\msw
-msbuild wx_vc17.sln -m -p:Configuration=Release;Platform=x64;PlatformToolset=v143;WindowsTargetPlatformVersion=10.0
+cd wxWidgets
+cmake . -Bbuild\msw\vc_x64_mswu 
 echo off
 IF %ERRORLEVEL% NEQ 0 (
-	PAUSE
-	GOTO:EOF
+        echo Failed during cmake create build directory
+        PAUSE
+        GOTO:EOF
 )
 echo on
-msbuild wx_vc17.sln -m -p:Configuration=Debug;Platform=x64;PlatformToolset=v143;WindowsTargetPlatformVersion=10.0
+cd build\msw\vc_x64_mswu
+cmake --build . --config Release
 echo off
 IF %ERRORLEVEL% NEQ 0 (
-	PAUSE
-	GOTO:EOF
+        echo Failed during cmake --build . --config Release
+        PAUSE
+        GOTO:EOF
 )
-
 echo on
+cmake --build . --config Debug
+IF %ERRORLEVEL% NEQ 0 (
+        echo Failed during cmake --build . --config Debug
+        PAUSE
+        GOTO:EOF
+)
+echo on
+xcopy /E /F /Y lib ..\..\..\lib
 cd ..\..\..
+cd ..
+echo on
 msbuild msvc/wallet.sln -p:Configuration=Debug;Platform=x64 -m
 echo off
 IF %ERRORLEVEL% NEQ 0 (
diff --git a/msvc/wxWidgets.bat b/msvc/wxWidgets.bat
new file mode 100644
index 0000000..3217494
--- /dev/null
+++ b/msvc/wxWidgets.bat
@@ -0,0 +1,62 @@
+echo on
+call C:\"Program Files (x86)"\"Microsoft Visual Studio"\2022\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat
+call C:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
+echo on
+cd wxWidgets
+cmake . -Bbuild\msw\vc_x64_mswu 
+echo off
+IF %ERRORLEVEL% NEQ 0 (
+        echo Failed during cmake create build directory
+        PAUSE
+        GOTO:EOF
+)
+echo on
+cd build\msw\vc_x64_mswu
+cmake --build . --config Release
+echo off
+IF %ERRORLEVEL% NEQ 0 (
+        echo Failed during cmake --build . --config Release
+        PAUSE
+        GOTO:EOF
+)
+echo on
+cmake --build . --config Debug
+IF %ERRORLEVEL% NEQ 0 (
+        echo Failed during cmake --build . --config Debug
+        PAUSE
+        GOTO:EOF
+)
+echo on
+xcopy /E /F /Y lib ..\..\..\lib
+cd ..\..\..
+cd ..
+
+msbuild msvc/wallet.sln -p:Configuration=Debug;Platform=x64 -m
+echo off
+IF %ERRORLEVEL% NEQ 0 (
+	PAUSE
+	GOTO:EOF
+)
+echo on
+msbuild msvc/wallet.sln -p:Configuration=Release;Platform=x64 -m
+echo off
+IF %ERRORLEVEL% NEQ 0 (
+	PAUSE
+	GOTO:EOF
+)
+echo on
+.\build\Release\wallet.exe --complete --test
+echo off
+IF %ERRORLEVEL% NEQ 0 (
+	echo failed unit test on release build
+) ELSE (
+	echo passed unit test on release build
+)
+echo on
+.\build\Debug\wallet.exe --complete --test
+echo off
+IF %ERRORLEVEL% NEQ 0 (
+	echo failed unit test on debug build
+) ELSE (
+	echo passed unit test on debug build
+)