diff --git a/meson.build b/meson.build
index 68954bc..0dca8c0 100644
--- a/meson.build
+++ b/meson.build
@@ -343,3 +343,7 @@
 if get_option('usb-code-update').enabled()
     subdir('usb')
 endif
+
+if get_option('side-switch-on-boot').enabled()
+    subdir('side-switch')
+endif
diff --git a/meson_options.txt b/meson_options.txt
index bdbec09..e9eecff 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -30,6 +30,11 @@
     description: 'Firmware update via USB.',
 )
 
+option(
+    'side-switch-on-boot', type: 'feature', value: 'enabled',
+    description: 'Automatic flash side switch on boot',
+)
+
 # Variables
 option(
     'active-bmc-max-allowed', type: 'integer',
diff --git a/side-switch/meson.build b/side-switch/meson.build
new file mode 100644
index 0000000..9104a5f
--- /dev/null
+++ b/side-switch/meson.build
@@ -0,0 +1,13 @@
+source = [
+    'side_switch.cpp',
+    ]
+
+executable(
+    'phosphor-bmc-side-switch',
+    source,
+    dependencies: [
+        phosphor_logging_dep,
+    ],
+    install: true,
+    install_dir: get_option('bindir')
+)
diff --git a/side-switch/side_switch.cpp b/side-switch/side_switch.cpp
new file mode 100644
index 0000000..2de3933
--- /dev/null
+++ b/side-switch/side_switch.cpp
@@ -0,0 +1,12 @@
+#include "side_switch.hpp"
+
+#include <phosphor-logging/lg2.hpp>
+
+PHOSPHOR_LOG2_USING;
+
+int main()
+{
+    info("Checking for side switch reboot");
+
+    // TODO - Future commits in series to fill in logic
+}
diff --git a/side-switch/side_switch.hpp b/side-switch/side_switch.hpp
new file mode 100644
index 0000000..6f70f09
--- /dev/null
+++ b/side-switch/side_switch.hpp
@@ -0,0 +1 @@
+#pragma once