diff --git a/Server/CMakeLists.txt b/Server/CMakeLists.txt
index f56d6a3..351eb5e 100644
--- a/Server/CMakeLists.txt
+++ b/Server/CMakeLists.txt
@@ -22,6 +22,7 @@ juce_add_gui_app(AudioGridderServer
 juce_generate_juce_header(AudioGridderServer)
 
 aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Source AG_SOURCES_SERVER)
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR}/Source/ServerSettings AG_SOURCES_SERVER_SETTINGS)
 
 if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   list(REMOVE_ITEM AG_SOURCES_SERVER "${CMAKE_CURRENT_SOURCE_DIR}/Source/Screen.mm")
@@ -31,7 +32,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
   list(REMOVE_ITEM  AG_SOURCES_SERVER "${CMAKE_CURRENT_SOURCE_DIR}/Source/ScreenHelper_linux.cpp")
 endif()
 
-target_sources(AudioGridderServer PRIVATE ${AG_SOURCES_SERVER} ${AG_SOURCES_COMMON})
+target_sources(AudioGridderServer PRIVATE ${AG_SOURCES_SERVER} ${AG_SOURCES_SERVER_SETTINGS} ${AG_SOURCES_COMMON})
 
 set(AG_PLUGINHOST_VST 0)
 if(AG_SDKS_ROOT)
diff --git a/Server/Source/ServerSettings/DiagnosticsTab.cpp b/Server/Source/ServerSettings/DiagnosticsTab.cpp
new file mode 100644
index 0000000..52dba0d
--- /dev/null
+++ b/Server/Source/ServerSettings/DiagnosticsTab.cpp
@@ -0,0 +1,8 @@
+/*
+* Copyright (c) 2024 Andreas Pohl
+* Licensed under MIT (https://github.com/apohl79/audiogridder/blob/master/COPYING)
+*
+* Author: Kieran Coulter
+*/
+
+#include "DiagnosticsTab.hpp"
diff --git a/Server/Source/ServerSettings/DiagnosticsTab.hpp b/Server/Source/ServerSettings/DiagnosticsTab.hpp
new file mode 100644
index 0000000..171c135
--- /dev/null
+++ b/Server/Source/ServerSettings/DiagnosticsTab.hpp
@@ -0,0 +1,16 @@
+/*
+* Copyright (c) 2024 Andreas Pohl
+* Licensed under MIT (https://github.com/apohl79/audiogridder/blob/master/COPYING)
+*
+* Author: Kieran Coulter
+*/
+
+#pragma once
+
+class DiagnosticsTab
+{
+  public:
+  private:
+};
+
+
diff --git a/Server/Source/ServerSettings/MainTab.cpp b/Server/Source/ServerSettings/MainTab.cpp
new file mode 100644
index 0000000..936932d
--- /dev/null
+++ b/Server/Source/ServerSettings/MainTab.cpp
@@ -0,0 +1,8 @@
+/*
+* Copyright (c) 2024 Andreas Pohl
+* Licensed under MIT (https://github.com/apohl79/audiogridder/blob/master/COPYING)
+*
+* Author: Kieran Coulter
+*/
+
+#include "MainTab.hpp"
diff --git a/Server/Source/ServerSettings/MainTab.hpp b/Server/Source/ServerSettings/MainTab.hpp
new file mode 100644
index 0000000..0e7d44c
--- /dev/null
+++ b/Server/Source/ServerSettings/MainTab.hpp
@@ -0,0 +1,16 @@
+/*
+* Copyright (c) 2024 Andreas Pohl
+* Licensed under MIT (https://github.com/apohl79/audiogridder/blob/master/COPYING)
+*
+* Author: Kieran Coulter
+*/
+
+#pragma once
+
+class MainTab
+{
+  public:
+  private:
+};
+
+
diff --git a/Server/Source/ServerSettings/PluginFormatsTab.cpp b/Server/Source/ServerSettings/PluginFormatsTab.cpp
new file mode 100644
index 0000000..eea7710
--- /dev/null
+++ b/Server/Source/ServerSettings/PluginFormatsTab.cpp
@@ -0,0 +1,8 @@
+/*
+* Copyright (c) 2024 Andreas Pohl
+* Licensed under MIT (https://github.com/apohl79/audiogridder/blob/master/COPYING)
+*
+* Author: Kieran Coulter
+*/
+
+#include "PluginFormatsTab.hpp"
diff --git a/Server/Source/ServerSettings/PluginFormatsTab.hpp b/Server/Source/ServerSettings/PluginFormatsTab.hpp
new file mode 100644
index 0000000..f0741fc
--- /dev/null
+++ b/Server/Source/ServerSettings/PluginFormatsTab.hpp
@@ -0,0 +1,14 @@
+/*
+* Copyright (c) 2024 Andreas Pohl
+* Licensed under MIT (https://github.com/apohl79/audiogridder/blob/master/COPYING)
+*
+* Author: Kieran Coulter
+*/
+
+#pragma once
+
+class PluginFormatsTab
+{
+  public:
+  private:
+};
diff --git a/Server/Source/ServerSettings/ScreenCapturingTab.cpp b/Server/Source/ServerSettings/ScreenCapturingTab.cpp
new file mode 100644
index 0000000..c1c1924
--- /dev/null
+++ b/Server/Source/ServerSettings/ScreenCapturingTab.cpp
@@ -0,0 +1,8 @@
+/*
+* Copyright (c) 2024 Andreas Pohl
+* Licensed under MIT (https://github.com/apohl79/audiogridder/blob/master/COPYING)
+*
+* Author: Kieran Coulter
+*/
+
+#include "ScreenCapturingTab.hpp"
diff --git a/Server/Source/ServerSettings/ScreenCapturingTab.hpp b/Server/Source/ServerSettings/ScreenCapturingTab.hpp
new file mode 100644
index 0000000..f7a5b4f
--- /dev/null
+++ b/Server/Source/ServerSettings/ScreenCapturingTab.hpp
@@ -0,0 +1,16 @@
+/*
+* Copyright (c) 2024 Andreas Pohl
+* Licensed under MIT (https://github.com/apohl79/audiogridder/blob/master/COPYING)
+*
+* Author: Kieran Coulter
+*/
+
+#pragma once
+
+class ScreenCapturingTab
+{
+  public:
+  private:
+};
+
+
diff --git a/Server/Source/ServerSettings/StartupTab.cpp b/Server/Source/ServerSettings/StartupTab.cpp
new file mode 100644
index 0000000..2ab9bcf
--- /dev/null
+++ b/Server/Source/ServerSettings/StartupTab.cpp
@@ -0,0 +1,8 @@
+/*
+* Copyright (c) 2024 Andreas Pohl
+* Licensed under MIT (https://github.com/apohl79/audiogridder/blob/master/COPYING)
+*
+* Author: Kieran Coulter
+*/
+
+#include "StartupTab.hpp"
diff --git a/Server/Source/ServerSettings/StartupTab.hpp b/Server/Source/ServerSettings/StartupTab.hpp
new file mode 100644
index 0000000..5733a4f
--- /dev/null
+++ b/Server/Source/ServerSettings/StartupTab.hpp
@@ -0,0 +1,16 @@
+/*
+* Copyright (c) 2024 Andreas Pohl
+* Licensed under MIT (https://github.com/apohl79/audiogridder/blob/master/COPYING)
+*
+* Author: Kieran Coulter
+*/
+
+#pragma once
+
+class StartupTab
+{
+  public:
+  private:
+};
+
+
diff --git a/Server/Source/ServerSettingsWindow.cpp b/Server/Source/ServerSettingsWindow.cpp
index c6043e6..b76f2e9 100644
--- a/Server/Source/ServerSettingsWindow.cpp
+++ b/Server/Source/ServerSettingsWindow.cpp
@@ -19,7 +19,8 @@ ServerSettingsWindow::ServerSettingsWindow(App* app)
                      LookAndFeel::getDefaultLookAndFeel().findColour(ResizableWindow::backgroundColourId),
                      DocumentWindow::closeButton),
       LogTag("settings"),
-      m_app(app) {
+      m_app(app),
+      m_tabbedComponent(TabbedButtonBar::TabsAtTop) {
     traceScope();
     setUsingNativeTitleBar(true);
 
diff --git a/Server/Source/ServerSettingsWindow.hpp b/Server/Source/ServerSettingsWindow.hpp
index 853802a..c967e73 100644
--- a/Server/Source/ServerSettingsWindow.hpp
+++ b/Server/Source/ServerSettingsWindow.hpp
@@ -11,6 +11,11 @@
 #include <JuceHeader.h>
 
 #include "Utils.hpp"
+#include "ServerSettings/MainTab.hpp"
+#include "ServerSettings/PluginFormatsTab.hpp"
+#include "ServerSettings/ScreenCapturingTab.hpp"
+#include "ServerSettings/StartupTab.hpp"
+#include "ServerSettings/DiagnosticsTab.hpp"
 
 namespace e47 {
 
@@ -35,6 +40,8 @@ class ServerSettingsWindow : public DocumentWindow, public LogTag {
     ComboBox m_screenCapturingMode, m_screenCapturingQuality, m_sandboxMode;
     TooltipWindow m_tooltipWindow;
 
+    TabbedComponent m_tabbedComponent;
+
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ServerSettingsWindow)
 };