diff --git a/package.json b/package.json
deleted file mode 100644
index 288dd2d..0000000
--- a/package.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "@react-native-async-storage/async-storage": "^1.17.12"
-  }
-}
diff --git a/vds-app/App/components/.ExamQuestions.js.kate-swp b/vds-app/App/components/.ExamQuestions.js.kate-swp
deleted file mode 100644
index 623cd8d..0000000
Binary files a/vds-app/App/components/.ExamQuestions.js.kate-swp and /dev/null differ
diff --git a/vds-app/App/components/ExamQuestions.js b/vds-app/App/components/ExamQuestions.js
index 96a3988..e0db57a 100644
--- a/vds-app/App/components/ExamQuestions.js
+++ b/vds-app/App/components/ExamQuestions.js
@@ -1,5 +1,5 @@
 import React from "react"
-import AsyncStorage from '@react-native-community/async-storage'
+import AsyncStorage from '@react-native-async-storage/async-storage'
 
 import aerodynamicsQuestions from "../data/aerodynamics"
 import firstAidQuestions from "../data/firstAid"
diff --git a/vds-app/App/screens/.Exam.js.kate-swp b/vds-app/App/screens/.Exam.js.kate-swp
deleted file mode 100644
index 7129b17..0000000
Binary files a/vds-app/App/screens/.Exam.js.kate-swp and /dev/null differ
diff --git a/vds-app/App/screens/.Quiz.js.kate-swp b/vds-app/App/screens/.Quiz.js.kate-swp
deleted file mode 100644
index 5cfee4c..0000000
Binary files a/vds-app/App/screens/.Quiz.js.kate-swp and /dev/null differ
diff --git a/vds-app/App/screens/.QuizIndex.js.kate-swp b/vds-app/App/screens/.QuizIndex.js.kate-swp
deleted file mode 100644
index fb3332f..0000000
Binary files a/vds-app/App/screens/.QuizIndex.js.kate-swp and /dev/null differ
diff --git a/vds-app/App/screens/.Recap.js.kate-swp b/vds-app/App/screens/.Recap.js.kate-swp
deleted file mode 100644
index a61d992..0000000
Binary files a/vds-app/App/screens/.Recap.js.kate-swp and /dev/null differ
diff --git a/vds-app/App/screens/.RecapTrueFalse.js.kate-swp b/vds-app/App/screens/.RecapTrueFalse.js.kate-swp
deleted file mode 100644
index 08928d6..0000000
Binary files a/vds-app/App/screens/.RecapTrueFalse.js.kate-swp and /dev/null differ
diff --git a/vds-app/App/screens/.Results.js.kate-swp b/vds-app/App/screens/.Results.js.kate-swp
deleted file mode 100644
index 290306a..0000000
Binary files a/vds-app/App/screens/.Results.js.kate-swp and /dev/null differ
diff --git a/vds-app/App/screens/.Setup.js.kate-swp b/vds-app/App/screens/.Setup.js.kate-swp
deleted file mode 100644
index a96abb2..0000000
Binary files a/vds-app/App/screens/.Setup.js.kate-swp and /dev/null differ
diff --git a/vds-app/App/screens/.Splash.js.kate-swp b/vds-app/App/screens/.Splash.js.kate-swp
deleted file mode 100644
index 70ff635..0000000
Binary files a/vds-app/App/screens/.Splash.js.kate-swp and /dev/null differ
diff --git a/vds-app/App/screens/Exam.js b/vds-app/App/screens/Exam.js
index 05bb228..bbc398f 100644
--- a/vds-app/App/screens/Exam.js
+++ b/vds-app/App/screens/Exam.js
@@ -1,7 +1,7 @@
 import React from "react"
 import { View, ScrollView, StyleSheet, StatusBar, Text, ImageBackground, BackHandler } from "react-native"
 import SafeAreaView from 'react-native-safe-area-view'
-import AsyncStorage from '@react-native-community/async-storage'
+import AsyncStorage from '@react-native-async-storage/async-storage'
 
 import { Button, ButtonContainer } from "../components/Button"
 import { colors, texts, examScheme } from "../components/Variables"
diff --git a/vds-app/App/screens/Quiz.js b/vds-app/App/screens/Quiz.js
index 0e47580..9e87c65 100644
--- a/vds-app/App/screens/Quiz.js
+++ b/vds-app/App/screens/Quiz.js
@@ -2,7 +2,7 @@ import React from "react"
 import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, ImageBackground, BackHandler } from "react-native"
 import { Picker } from '@react-native-picker/picker'
 import SafeAreaView from 'react-native-safe-area-view'
-import AsyncStorage from '@react-native-community/async-storage'
+import AsyncStorage from '@react-native-async-storage/async-storage'
 
 import { Button, ButtonContainer } from "../components/Button"
 import { texts, colors, credentials } from "../components/Variables"
diff --git a/vds-app/App/screens/QuizIndex.js b/vds-app/App/screens/QuizIndex.js
index e7ba5d5..fb24e22 100644
--- a/vds-app/App/screens/QuizIndex.js
+++ b/vds-app/App/screens/QuizIndex.js
@@ -1,6 +1,6 @@
 import React from "react"
 import { View, ScrollView, StatusBar, BackHandler, StyleSheet, Dimensions, ImageBackground } from "react-native"
-import AsyncStorage from '@react-native-community/async-storage'
+import AsyncStorage from '@react-native-async-storage/async-storage'
 
 import aerodynamicsQuestions from "../data/aerodynamics"
 import firstAidQuestions from "../data/firstAid"
diff --git a/vds-app/App/screens/Recap.js b/vds-app/App/screens/Recap.js
index 34f55e7..cb3bae2 100644
--- a/vds-app/App/screens/Recap.js
+++ b/vds-app/App/screens/Recap.js
@@ -1,7 +1,7 @@
 import React from "react"
 import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, Image, ImageBackground, BackHandler} from "react-native"
 import SafeAreaView from 'react-native-safe-area-view'
-import AsyncStorage from '@react-native-community/async-storage'
+import AsyncStorage from '@react-native-async-storage/async-storage'
 
 import { Button, ButtonContainer } from "../components/Button"
 import { colors, texts, examScheme, credentials } from "../components/Variables"
diff --git a/vds-app/App/screens/RecapTrueFalse.js b/vds-app/App/screens/RecapTrueFalse.js
index ba4eb01..725393c 100644
--- a/vds-app/App/screens/RecapTrueFalse.js
+++ b/vds-app/App/screens/RecapTrueFalse.js
@@ -1,7 +1,7 @@
 import React from "react"
 import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, Image, ImageBackground, BackHandler } from "react-native"
 import SafeAreaView from 'react-native-safe-area-view'
-import AsyncStorage from '@react-native-community/async-storage'
+import AsyncStorage from '@react-native-async-storage/async-storage'
 
 import { Button, ButtonContainer } from "../components/Button"
 import { colors, texts, examScheme, credentials } from "../components/Variables"
diff --git a/vds-app/App/screens/Results.js b/vds-app/App/screens/Results.js
index 69dc796..ce88d64 100644
--- a/vds-app/App/screens/Results.js
+++ b/vds-app/App/screens/Results.js
@@ -1,7 +1,7 @@
 import React from "react"
 import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, Image, BackHandler} from "react-native"
 import SafeAreaView from 'react-native-safe-area-view'
-import AsyncStorage from '@react-native-community/async-storage'
+import AsyncStorage from '@react-native-async-storage/async-storage'
 
 import { Button, ButtonContainer } from "../components/Button"
 import { colors, texts, examScheme } from "../components/Variables"
diff --git a/vds-app/App/screens/Setup.js b/vds-app/App/screens/Setup.js
index 14bbf5e..8870c16 100644
--- a/vds-app/App/screens/Setup.js
+++ b/vds-app/App/screens/Setup.js
@@ -1,7 +1,7 @@
 import React from "react"
 import { View, ScrollView, StyleSheet, StatusBar, Text, CheckBox, Switch, Dimensions, Image, ImageBackground, BackHandler } from "react-native"
 import SafeAreaView from 'react-native-safe-area-view'
-import AsyncStorage from '@react-native-community/async-storage'
+import AsyncStorage from '@react-native-async-storage/async-storage'
 
 import { Button, ButtonContainer } from "../components/Button"
 import { colors, texts, examScheme, resultsScheme} from "../components/Variables"
diff --git a/vds-app/App/screens/Splash.js b/vds-app/App/screens/Splash.js
index 08a5a6d..9cdd3cc 100644
--- a/vds-app/App/screens/Splash.js
+++ b/vds-app/App/screens/Splash.js
@@ -1,6 +1,6 @@
 import React from "react"
 import { View, ScrollView, StyleSheet, StatusBar, Text, Dimensions, Image, Alert, BackHandler } from "react-native"
-import AsyncStorage from '@react-native-community/async-storage'
+import AsyncStorage from '@react-native-async-storage/async-storage'
 import SafeAreaView from 'react-native-safe-area-view'
 
 import { Button, ButtonContainer } from "../components/Button"
diff --git a/vds-app/dist/bundles/.android-21da78b5401f0954d05cf90eba32fc85.map.kate-swp b/vds-app/dist/bundles/.android-21da78b5401f0954d05cf90eba32fc85.map.kate-swp
deleted file mode 100644
index 866452c..0000000
Binary files a/vds-app/dist/bundles/.android-21da78b5401f0954d05cf90eba32fc85.map.kate-swp and /dev/null differ
diff --git a/vds-app/dist/bundles/.ios-62b68d2e0eb54df3fa8210b6752aa722.map.kate-swp b/vds-app/dist/bundles/.ios-62b68d2e0eb54df3fa8210b6752aa722.map.kate-swp
deleted file mode 100644
index fee58ae..0000000
Binary files a/vds-app/dist/bundles/.ios-62b68d2e0eb54df3fa8210b6752aa722.map.kate-swp and /dev/null differ
diff --git a/vds-app/package.json b/vds-app/package.json
index 2a424b2..dda0201 100644
--- a/vds-app/package.json
+++ b/vds-app/package.json
@@ -1,6 +1,7 @@
 {
   "name": "vds-quiz",
   "version": "3.7.0",
+  "license": "MIT",
   "main": "node_modules/expo/AppEntry.js",
   "scripts": {
     "start": "expo start",
@@ -15,15 +16,16 @@
   },
   "dependencies": {
     "@expo/config-plugins": "^6.0.1",
-    "@react-native-async-storage/async-storage": "^1.17.12",
-    "@react-native-picker/picker": "^2.4.9",
+    "@react-native-async-storage/async-storage": "^1.17.11",
+    "@react-native-masked-view/masked-view": "^0.2.8",
+    "@react-native-picker/picker": "^2.4.8",
     "expo": "^48.0.8",
     "expo-build-properties": "~0.5.1",
     "expo-dev-client": "~2.1.6",
     "expo-permissions": "^14.1.1",
     "expo-updates": "~0.16.3",
     "react": "^18.2.0",
-    "react-native": "0.71.3",
+    "react-native": "0.71.4",
     "react-native-gesture-handler": "^2.9.0",
     "react-native-google-mobile-ads": "^10.0.0",
     "react-native-reanimated": "~2.14.4",
@@ -36,10 +38,15 @@
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",
+    "@react-native-community/masked-view": "^0.1.11",
     "babel-preset-expo": "^9.3.0",
     "eslint": "^8.36.0",
     "eslint-config-handlebarlabs": "^0.0.6",
+    "@babel/preset-env": "^7.20.2",
     "prettier": "^2.8.6"
   },
+  "peerDependencies": {
+    "expo-modules-autolinking": "^1.1.2"
+  },
   "private": true
 }