diff --git a/src/docs/faq/audio-sharing.md b/src/docs/faq/audio-sharing.md
new file mode 100644
index 0000000..a7fc7ee
--- /dev/null
+++ b/src/docs/faq/audio-sharing.md
@@ -0,0 +1,16 @@
+## Audio Sharing
+
+### How do I use Audio Sharing?
+
+You can find out how to use Audio Sharing in our how-to [docs](https://www.owlbear.rodeo/how-to#sharingAudio). 
+
+### Why isn’t audio sharing working?
+
+Your audio sharing may not be working for a few reasons:
+
+- Your browser doesn’t support audio sharing. Be sure that you are using Chrome for sharing audio, and that your player is is another tab in Chrome. 
+- No audio found when sharing audio. 
+
+### I’ve added a map to my game, why can’t my players see it? 
+
+This could be because it’s taking a while to upload. Ensure that your players can see a loading bar at the top of the site. Owlbear Rodeo will do its best to load a lower quality map, before continuing to load in higher quality. 
\ No newline at end of file
diff --git a/src/docs/faq/database.md b/src/docs/faq/database.md
new file mode 100644
index 0000000..1508aa9
--- /dev/null
+++ b/src/docs/faq/database.md
@@ -0,0 +1,5 @@
+## Database
+
+### Database is diasbled.
+
+Owlbear Rodeo uses a local database to store saved data. If you are seeing a database is disabled message this usually means you have data storage disabled. The most common occurrences of this is if you are using Private Browsing modes or in Firefox have the Never Remember History option enabled. The site will still function in these cases however all data will be lost when the page closes or reloads.
\ No newline at end of file
diff --git a/src/docs/faq/maps.md b/src/docs/faq/maps.md
new file mode 100644
index 0000000..387b565
--- /dev/null
+++ b/src/docs/faq/maps.md
@@ -0,0 +1,25 @@
+## Games & Maps
+
+### I’ve added a map to my game, why can’t my players see it? 
+
+This could be because it’s taking a while to upload. Ensure that your players can see a loading bar at the top of the site. Owlbear Rodeo will do its best to load a lower quality map, before continuing to load in higher quality. See 'How big can my maps be?' in our faqs.
+
+### Why do some of my tokens have a question mark on them?
+
+This means that the token hasn’t loaded in just yet. If they still haven’t loaded in after some time, try giving the page a refresh. You should see load progress on the loading bar at the top of the website. 
+
+### How big can my maps be?
+
+Owlbear Rodeo doesn't impose a limit on map sizes but keep in mind the larger the map you upload the longer it will take for your players to load and the harder it will be for your computer to run. We recommend trying to keep your maps under 10MB with a good internet connection and under 5MB with slower internet. If you accidently upload a map that is too big you can use the quality option in the map's settings to lower the size without needing to re-upload your map.
+
+### Where are my maps stored?
+
+Your maps are stored on your local device. This means that clearing your cache will delete your maps, so please only do so if you have no other options. 
+
+### How long does a game I create last?
+
+We encourage users to create games every 24hrs. Any maps you have added or made edits to will not be effected and will still be available when you create another game.
+
+### I can join my game but the spinner is constantly loading, why?
+
+This could mean that the service is currently down. Please visit us on Twitter or Reddit and let us know. 
\ No newline at end of file
diff --git a/src/routes/FAQ.js b/src/routes/FAQ.js
index b1b0a01..f9aa664 100644
--- a/src/routes/FAQ.js
+++ b/src/routes/FAQ.js
@@ -7,8 +7,9 @@ import Markdown from "../components/Markdown";
 
 import assets from "../docs/assets";
 
-const connection = raw("../docs/faq/connection.md");
-const saving = raw("../docs/faq/saving.md");
+const database = raw("../docs/faq/database.md");
+const maps = raw("../docs/faq/maps.md");
+const audioSharing = raw("../docs/faq/audio-sharing.md");
 
 function FAQ() {
   return (
@@ -31,11 +32,14 @@ function FAQ() {
         <Text mb={2} variant="heading" as="h1" sx={{ fontSize: 5 }}>
           Frequently Asked Questions
         </Text>
-        <div id="connection">
-          <Markdown source={connection} assets={assets} />
+        <div id="database">
+          <Markdown source={database} assets={assets} />
         </div>
-        <div id="saving">
-          <Markdown source={saving} assets={assets} />
+        <div id="maps">
+          <Markdown source={maps} assets={assets} />
+        </div>
+        <div id="audio-sharing">
+          <Markdown source={audioSharing} assets={assets} />
         </div>
       </Flex>
       <Footer />