diff --git a/CLI/Program.cs b/CLI/Program.cs
index 1f51d40..bc8a16f 100644
--- a/CLI/Program.cs
+++ b/CLI/Program.cs
@@ -3,9 +3,32 @@ namespace CLI;
 
 class Program
 {
-	static void Main(string[] args)
 	static string BINARY_NAME = "pass";
+	
+	static int Main(string[] args)
 	{
-		
+		//ConfigFileManager.ExceptionOccured += (e) => ErrorOccured(e);
+		//ConfigFileManager.Init();
+
+		if (args.Length == 0)
+		{
+			ListPasswords();
+			return 0;
+		}
+		else
+		{
+			switch (args[0])
+			{
+				case "help":
+					HelpMessage();
+					break;
+				default:
+					HelpMessage();
+					break;
+			}
+		}
+
+		return 0;
+	}
 	}
 }