diff --git a/argument.hpp b/argument.hpp
new file mode 100644
index 0000000..af5ac46
--- /dev/null
+++ b/argument.hpp
@@ -0,0 +1,45 @@
+#pragma once
+
+#include <getopt.h>
+
+#include <map>
+#include <string>
+
+namespace phosphor
+{
+namespace certs
+{
+namespace util
+{
+
+/**
+ * @brief Class - Encapsulates parsing command line options and
+ *                populating arguments.
+ */
+class ArgumentParser
+{
+  public:
+    ArgumentParser(int argc, char** argv);
+    ArgumentParser() = delete;
+    ArgumentParser(const ArgumentParser&) = delete;
+    ArgumentParser(ArgumentParser&&) = default;
+    ArgumentParser& operator=(const ArgumentParser&) = delete;
+    ArgumentParser& operator=(ArgumentParser&&) = default;
+    ~ArgumentParser() = default;
+    const std::string& operator[](const std::string& opt);
+
+    static void usage(char** argv);
+
+    static const std::string true_string;
+    static const std::string empty_string;
+
+  private:
+    std::map<const std::string, std::string> arguments;
+
+    static const option options[];
+    static const char* optionstr;
+};
+
+} // namespace util
+} // namespace certs
+} // namespace phosphor