diff --git a/Makefile.am b/Makefile.am
index 7f99e00..d373416 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,3 +34,5 @@
 	| $(AWK) '{print "$(DESTDIR)"$$1}' | xargs rm -fv
 
 endif
+
+SUBDIRS = fail-monitor
diff --git a/configure.ac b/configure.ac
index bd80240..10ea4af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([subdir-objects -Wall -Werror foreign dist-xz])
 AM_SILENT_RULES([yes])
+AC_LANG([C++])
 
 # Modify header template
 AH_TOP([#pragma once])
@@ -12,6 +13,7 @@
 
 # Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AM_PROG_AR
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
@@ -29,7 +31,8 @@
 AC_CHECK_HEADER(systemd/sd-bus.h, ,[AC_MSG_ERROR([Could not find systemd/sd-bus.h...systemd development package required])])
 
 # Checks for typedefs, structures, and compiler characteristics.
-AX_APPEND_COMPILE_FLAGS([-fpic -Wall -Werror], [CFLAGS])
+AX_CXX_COMPILE_STDCXX_14([noext])
+AX_APPEND_COMPILE_FLAGS([-fpic -Wall -Werror], [CFLAGS CXXFLAGS])
 
 # Checks for library functions.
 LT_INIT([disable-static shared])
@@ -72,5 +75,5 @@
 )
 
 # Create configured output
-AC_CONFIG_FILES([Makefile setup.py])
+AC_CONFIG_FILES([Makefile setup.py fail-monitor/Makefile])
 AC_OUTPUT
diff --git a/fail-monitor/Makefile.am b/fail-monitor/Makefile.am
new file mode 100644
index 0000000..1976be1
--- /dev/null
+++ b/fail-monitor/Makefile.am
@@ -0,0 +1,7 @@
+AM_DEFAULT_SOURCE_EXT = .cpp
+
+sbin_PROGRAMS = \
+	phosphor-unit-failure-monitor
+
+phosphor_unit_failure_monitor_SOURCES = \
+	main.cpp
diff --git a/fail-monitor/main.cpp b/fail-monitor/main.cpp
new file mode 100644
index 0000000..b13dc7f
--- /dev/null
+++ b/fail-monitor/main.cpp
@@ -0,0 +1,30 @@
+/**
+ * Copyright © 2017 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This application will check the ActiveState property
+ * on the source unit passed in.  If that state is 'failed',
+ * then it will either stop or start the target unit, depending
+ * on the command line arguments.
+ */
+
+
+int main(int argc, char** argv)
+{
+
+
+    return 0;
+}