diff --git a/Android-User-Data-and-Storage.md b/Android-User-Data-and-Storage.md
new file mode 100644
index 0000000..25ecf7f
--- /dev/null
+++ b/Android-User-Data-and-Storage.md
@@ -0,0 +1,19 @@
+Azahar's user data storage on Android Beta 16+ can be a bit complicated. This is due to Google mandating that all Android apps need to use SAF (Safe Access Storage) moving forward.
+
+## How to set up your Azahar user data folder
+After installing and launching Azahar, you'll be greeted by a popup. Read it and press `Ok`.
+
+This will open up a folder browser. Now you'll need to create and select a folder to use for Azahar's user data. You can do this either on your phone's internal storage or SD-Card.
+
+Open up the folder you've made and select the `USE THIS FOLDER` button.
+
+And you're done! Now you can move on to setting up a game folder.
+
+## How to set up your game folder
+After setting up your user data folder, Azahar will greet you with another pop-up. Read it and press `Ok`.
+
+This will open up a folder browser. If you're updating from an older Azahar version, you'll already have a folder where you store your games. Open that folder and select `USE THIS FOLDER`. If you're setting Azahar up for the first time, and you haven't made a folder for your games yet, do so now.
+
+Open up the folder you've made and select the `USE THIS FOLDER` button.
+
+You have the option of changing the locations of these folders at any time. You can find these options by clicking on the folder icon on the top bar.
\ No newline at end of file