diff --git a/.vitepress/config.mts b/.vitepress/config.mts
index 48b6807..9f811ab 100644
--- a/.vitepress/config.mts
+++ b/.vitepress/config.mts
@@ -30,7 +30,8 @@ export default defineConfig({
       {
         text: 'Other',
         items: [
-          { text: 'Connecting to WiFi', link: '/connect-to-wifi' }
+          { text: 'Connecting to WiFi', link: '/connect-to-wifi' },
+          { text: 'FAQ', link: '/faq' }
         ]
       }
     ],
diff --git a/docs/faq.md b/docs/faq.md
new file mode 100644
index 0000000..3cb23be
--- /dev/null
+++ b/docs/faq.md
@@ -0,0 +1,8 @@
+# FAQ
+<small>Frequently Asked Questions</small>
+## Servers:
+- **Will they cost money to use?** We will not be charging any money for you to use our servers. Some people may offer servers for money, however there will always be an offical server for free. We cannot promise that our free servers will be as high of a quality as the paid ones, however it's still better than no servers.
+- **When will they be public?** Once they work completely and are completely compatable we will begin work on publishing.
+- **Will the source be public?** For most server types, yes. However for some (including Pegasus) we won't be able to publish the source for legal reasons.
+## JiboOS:
+- **Will it be possible to build applications for Jibo?** Yes, we are working on the ability to develop apps for Jibo. Not much progress has been made yet however.
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
index 971f814..b4bc955 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -11,8 +11,8 @@ hero:
       text: Install
       link: /intro-install
     - theme: alt
-      text: Developing for Jibo
-      link: /intro-dev
+      text: FAQ
+      link: /faq
 
 features:
   - title: Talk to Jibo again!