diff --git a/EditPath.md b/EditPath.md
deleted file mode 100644
index 29a716c..0000000
--- a/EditPath.md
+++ /dev/null
@@ -1,118 +0,0 @@
-# EditPath
-
-EditPath is a Windows console (text-based, command-line) program for managing the system Path and user Path.
-
-# Author
-
-Bill Stewart - bstewart at iname dot com
-
-# License
-
-EditPath.exe is covered by the GNU Lesser Public License (LPGL). See the file `LICENSE` for details.
-
-# Download
-
-https://github.com/Bill-Stewart/PathMgr/releases/
-
-# Background
-
-The system Path is found in the following location in the Windows registry:
-
-Root: `HKEY_LOCAL_MACHINE`  
-Subkey: `SYSTEM\CurrentControlSet\Control\Session Manager\Environment`  
-Value name: `Path`
-
-The current user Path is found in the following location in the registry:
-
-Root: `HKEY_CURRENT_USER`  
-Subkey: `Environment`  
-Value name: `Path`
-
-In both cases, the `Path` value is (or should be) the registry type `REG_EXPAND_SZ`, which means that it is a string that can contain values surrounded by `%` characters that Windows will automatically expand to environment variable values. (For example, `%SystemRoot%` will be expanded to `C:\Windows` on most systems.)
-
-The `Path` value contains a `;`-delimited list of directory names that the system should search for executables, library files, scripts, etc. Windows appends the content of the current user Path to the system Path and expands the environment variable references. The resulting string is set as the `Path` environment variable for processes.
-
-EditPath provides a command-line interface for managing the `Path` value in the system location (in `HKEY_LOCAL_MACHINE`) and the current user location (in `HKEY_CURRENT_USER`).
-
-# Usage
-
-The following describes the command-line usage for the program. Parameters are case-sensitive.
-
-**EditPath** [_options_] _type_ _action_
-
-You must specify only one of the following _type_ parameters:
-
-| _type_       | Abbreviation | Description
-| -------      | ------------ | -----------
-| **--system** | **-s**       | Specifies the system Path
-| **--user**   | **-u**       | Specifies the user Path
-
-You must specify only one of the following _action_ parameters:
-
-| _action_                     | Abbreviation           | Description
-| --------                     | ------------           | -----------
-| **--list**                   | **-l**                 | Lists directories in Path
-| **--test "**_dirname_**"**   | **-t "**_dirname_**"** | Tests if directory exists in Path
-| **--add "**_dirname_**"**    | **-a "**_dirname_**"** | Adds directory to Path
-| **--remove "**_dirname_**"** | **-r "**_dirname_**"** | Removes directory from Path
-
-The following parameters are optional:
-
-| _options_       | Abbreviation | Description
-| ---------       | ------------ | -----------
-| **--quiet**     | **-q**       | Suppresses result messages
-| **--expand**    | **-x**       | Expands environment variables (**--list** only)
-| **--beginning** | **-b**       | Adds to beginning of Path (**--add** only)
-
-# Exit Codes
-
-The following table lists typical exit codes when not using **--test** (**-t**).
-
-| Exit Code | Description
-| --------- | -----------
-| 0         | No errors
-| 2         | The Path value is not present in the registry
-| 3         | The specified directory does not exist in the Path
-| 5         | Access is denied
-| 87        | Incorrect parameter(s)
-| 183       | The specified directory already exists in the Path
-
-The following table lists typical exit codes when using **--test** (**-t**).
-
-| Exit Code | Description
-| --------- | -----------
-| 1         | The specified directory exists in the unexpanded Path
-| 2         | The specified directory exists in the expanded Path
-| 3         | The specified directory does not exist in the Path
-
-# Remarks
-
-* Anything on the command line after **--test**, **--add**, or **--remove** is considered to be the argument for the parameter. To avoid ambiguity, specify the _action_ parameter last on the command line.
-
-* Uexpanded vs. expanded refers to whether the environment variable references (i.e., names between `%` characters) are expanded after retrieving the Path value from the registry. For example, `%SystemRoot%` is unexpanded but `C:\Windows` is expanded.
-
-* The **--add** (**-a**) parameter checks whether the specified directory exists in both the unexpanded and expanded copies of the Path before adding the directory. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--add C:\TestApp` will return exit code 183 (i.e., the directory already exists in the Path) because `%TESTAPP%` expands to `C:\TestApp`.
-
-* The **--remove** (**-r**) parameter does not expand environment variable references. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--remove "C:\TestApp"` will return exit code 3 (i.e., the directory does not exist in the Path) because **--remove** does not expand `%TESTAPP%` to `C:\TestApp`. For the command to succeed, you would have to specify `--remove "%TESTAPP%"` instead.
-
-* The program will exit with error code 87 if a parameter (or an argument to a parameter) is missing or not valid, if mutually exclusive parameters are specified, etc.
-
-* The program will exit with error code 5 if the current user does not have permission to update the Path value in the registry (for example, if you try to update the system Path using a standard user account or an unelevated administrator account).
-
-# Examples
-
-1.  `EditPath --expand --system --list`
-
-    This command outputs the directories in the system Path, with environment variables expanded. You can also write this command as `EditPath -x -s -l`.
-
-2.  `EditPath --user --add "%LOCALAPPDATA%\Programs\MyApp"`
-
-    Adds the specified directory name to the user Path.
-
-3.  `EditPath -s -r "C:\Program Files\MyApp\bin"`
-
-    Removes the specified directory from the system Path.
-
-4.  `EditPath -s --test "C:\Program Files (x86)\MyApp\bin"`
-
-    Returns an exit code of 3 if the specified directory is not in the system Path, 1 if the specified directory is in the unexpanded copy of the system Path, or 2 if the specified directory is in the expanded copy of the system Path.
diff --git a/EditPath.pp b/EditPath.pp
deleted file mode 100644
index 79022c6..0000000
--- a/EditPath.pp
+++ /dev/null
@@ -1,386 +0,0 @@
-{ Copyright (C) 2004-2023 by Bill Stewart (bstewart at iname.com)
-
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the Free
-  Software Foundation; either version 3 of the License, or (at your option) any
-  later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
-  details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program. If not, see https://www.gnu.org/licenses/.
-
-}
-
-{$MODE OBJFPC}
-{$H+}
-{$R *.res}
-{$APPTYPE CONSOLE}
-
-program EditPath;
-
-uses
-  getopts,
-  Windows,
-  wsPathMgr,
-  wsUtilMsg,
-  wsUtilStr;
-
-type
-  TCommandLine = object
-    ErrorCode:         Word;
-    ErrorMessage:      UnicodeString;
-    ArgHelp:           Boolean;        // --help/-h
-    ArgQuiet:          Boolean;        // --quiet/-q
-    ArgAddToPath:      UnicodeString;  // --add/-a
-    ArgAddToBeginning: Boolean;        // --beginning/-b
-    ArgList:           Boolean;        // --list/-l
-    ArgRemoveFromPath: UnicodeString;  // --remove/-r
-    ArgPathSystem:     Boolean;        // --system/-s
-    ArgTest:           UnicodeString;  // --test/-t
-    ArgPathUser:       Boolean;        // --user/-u
-    ArgExpand:         Boolean;        // --expand/-x
-    function CountBits(N: DWORD): DWORD;
-    procedure Parse();
-  end;
-
-var
-  CommandLine: TCommandLine;
-  PathType: TPathType;
-  PathAddType: TPathAddType;
-  PathFindType: TPathFindType;
-  OutputStr: UnicodeString;
-
-procedure Usage();
-const
-  NEWLINE: UnicodeString = #13 + #10;
-var
-  UsageText: UnicodeString;
-begin
-  UsageText := 'EditPath 4.0 - Copyright (C) 2004-2023 by Bill Stewart (bstewart at iname.com)' + NEWLINE
-    + NEWLINE
-    + 'This is free software and comes with ABSOLUTELY NO WARRANTY.' + NEWLINE
-    + NEWLINE
-    + 'Usage: EditPath [<options>] <type> <action>' + NEWLINE
-    + NEWLINE
-    + 'You must specify one of each parameter from <type> and <action> (see below).' + NEWLINE
-    + 'Other <options> are optional. Parameters are case-sensitive.' + NEWLINE
-    + NEWLINE
-    + '<type>    Abbreviation  Description' + NEWLINE
-    + '-------------------------------------------------' + NEWLINE
-    + '--system  -s            Specifies the system Path' + NEWLINE
-    + '--user    -u            Specifies the user Path' + NEWLINE
-    + NEWLINE
-    + '<action>            Abbreviation  Description' + NEWLINE
-    + '-------------------------------------------------------------------' + NEWLINE
-    + '--list              -l            Lists directories in Path' + NEWLINE
-    + '--test "dirname"    -t "dirname"  Tests if directory exists in Path' + NEWLINE
-    + '--add "dirname"     -a "dirname"  Adds directory to Path' + NEWLINE
-    + '--remove "dirname"  -r "dirname"  Removes directory from Path' + NEWLINE
-    + NEWLINE
-    + '<options>    Abbreviation  Description' + NEWLINE
-    + '----------------------------------------------------------------------' + NEWLINE
-    + '--quiet      -q            Suppresses result messages' + NEWLINE
-    + '--expand     -x            Expands environment variables (--list only)' + NEWLINE
-    + '--beginning  -b            Adds to beginning of Path (--add only)' + NEWLINE
-    + NEWLINE
-    + 'Anything on the command line after --test, --add, or --remove is' + NEWLINE
-    + 'considered to be the argument for the parameter. To avoid ambiguity,' + NEWLINE
-    + 'specify the <action> parameter last on the command line.' + NEWLINE
-    + NEWLINE
-    + 'Typical exit codes when not using --test (-t):' + NEWLINE
-    + '0 - No errors' + NEWLINE
-    + '2 - The Path value is not present in the registry' + NEWLINE
-    + '3 - The specified directory does not exist in the Path' + NEWLINE
-    + '5 - Access is denied' + NEWLINE
-    + '87 - Incorrect parameter(s)' + NEWLINE
-    + '183 - The specified directory already exists in the Path' + NEWLINE
-    + NEWLINE
-    + 'Typical exit codes when using --test (-t):' + NEWLINE
-    + '1 - The specified directory exists in the unexpanded Path' + NEWLINE
-    + '2 - The specified directory exists in the expanded Path' + NEWLINE
-    + '3 - The specified directory does not exist in the Path';
-  WriteLn(UsageText);
-end;
-
-function TCommandLine.CountBits(N: DWORD): DWORD;
-var
-  Count: DWORD = 0;
-begin
-  // Counts the number of bits set in N
-  while N <> 0 do
-  begin
-    Count := Count + (N and 1);
-    N := N shr 1;
-  end;
-  result := Count;
-end;
-
-procedure TCommandLine.Parse();
-const
-  REQ_ARGS_ACTION_NONE     = 0;
-  REQ_ARGS_ACTION_ADD      = 1;
-  REQ_ARGS_ACTION_LIST     = 2;
-  REQ_ARGS_ACTION_REMOVE   = 4;
-  REQ_ARGS_ACTION_TEST     = 8;
-  REQ_ARGS_PATHTYPE_NONE   = 0;
-  REQ_ARGS_PATHTYPE_SYSTEM = 1;
-  REQ_ARGS_PATHTYPE_USER   = 2;
-var
-  LongOpts: array[1..11] of TOption;
-  Opt: Char;
-  I: LongInt;
-  ReqArgsAction, ReqArgsPathType: DWORD;
-begin
-  // Set up array of options; requires final option with empty name;
-  // set Value member to specify short option match for GetLongOps
-  with LongOpts[1] do
-  begin
-    Name := 'add';
-    Has_arg := Required_Argument;
-    Flag := nil;
-    Value := 'a';
-  end;
-  with LongOpts[2] do
-  begin
-    Name := 'beginning';
-    Has_arg := No_Argument;
-    Flag := nil;
-    Value := 'b';
-  end;
-  with LongOpts[3] do
-  begin
-    Name := 'help';
-    Has_arg := No_Argument;
-    Flag := nil;
-    Value := 'h';
-  end;
-  with LongOpts[4] do
-  begin
-    Name := 'list';
-    Has_arg := No_Argument;
-    Flag := nil;
-    Value := 'l';
-  end;
-  with LongOpts[5] do
-  begin
-    Name := 'quiet';
-    Has_arg := No_Argument;
-    Flag := nil;
-    Value := 'q';
-  end;
-  with LongOpts[6] do
-  begin
-    Name := 'remove';
-    Has_arg := Required_Argument;
-    Flag := nil;
-    Value := 'r';
-  end;
-  with LongOpts[7] do
-  begin
-    Name := 'system';
-    Has_arg := No_Argument;
-    Flag := nil;
-    Value := 's';
-  end;
-  with LongOpts[8] do
-  begin
-    Name := 'test';
-    Has_arg := Required_Argument;
-    Flag := nil;
-    Value := 't';
-  end;
-  with LongOpts[9] do
-  begin
-    Name := 'user';
-    Has_arg := No_Argument;
-    Flag := nil;
-    Value := 'u';
-  end;
-  with LongOpts[10] do
-  begin
-    Name := 'expand';
-    Has_arg := No_Argument;
-    Flag := nil;
-    Value := 'x';
-  end;
-  with LongOpts[11] do
-  begin
-    Name := '';
-    Has_arg := No_Argument;
-    Flag := nil;
-    Value := #0;
-  end;
-  // Initialize defaults
-  ErrorCode := 0;
-  ErrorMessage := '';
-  ArgAddToPath := '';          // --add/-a
-  ArgAddToBeginning := false;  // --beginning/-b
-  ArgHelp := false;            // --help/-h
-  ArgList := false;            // --list/-l
-  ArgQuiet := false;           // --quiet/-q
-  ArgRemoveFromPath := '';     // --remove/-r
-  ArgPathSystem := false;      // --system/-s
-  ArgTest := '';               // --test/-t
-  ArgPathUser := false;        // --user/-u
-  ArgExpand := false;          // --expand/-x
-  ReqArgsAction := REQ_ARGS_ACTION_NONE;
-  ReqArgsPathType := REQ_ARGS_PATHTYPE_NONE;
-  OptErr := false;  // no error outputs from getopts
-  repeat
-    Opt := GetLongOpts('a:bhlqr:st:ux', @LongOpts, I);
-    case Opt of
-      'a':
-      begin
-        ReqArgsAction := ReqArgsAction or REQ_ARGS_ACTION_ADD;
-        ArgAddToPath := StringToUnicodeString(OptArg, CP_ACP);
-      end;
-      'b': ArgAddToBeginning := true;
-      'h': ArgHelp := true;
-      'l':
-      begin
-        ReqArgsAction := ReqArgsAction or REQ_ARGS_ACTION_LIST;
-        ArgList := true;
-      end;
-      'q': ArgQuiet := true;
-      'r':
-      begin
-        ReqArgsAction := ReqArgsAction or REQ_ARGS_ACTION_REMOVE;
-        ArgRemoveFromPath := StringToUnicodeString(OptArg, CP_ACP);
-      end;
-      's':
-      begin
-        ReqArgsPathType := ReqArgsPathType or REQ_ARGS_PATHTYPE_SYSTEM;
-        ArgPathSystem := true;
-      end;
-      't':
-      begin
-        ReqArgsAction := ReqArgsAction or REQ_ARGS_ACTION_TEST;
-        ArgTest := StringToUnicodeString(OptArg, CP_ACP);
-      end;
-      'u':
-      begin
-        ReqArgsPathType := ReqArgsPathType or REQ_ARGS_PATHTYPE_USER;
-        ArgPathUser := true;
-      end;
-      'x': ArgExpand := true;
-      '?':
-      begin
-        ErrorCode := ERROR_INVALID_PARAMETER;
-        ErrorMessage := 'Incorrect parameter(s). Use --help (-h) for usage.';
-      end;
-    end; //case Opt
-  until Opt = EndOfOptions;
-  if ErrorCode = 0 then
-  begin
-    if (ReqArgsAction = REQ_ARGS_ACTION_NONE) or (ReqArgsPathType = REQ_ARGS_PATHTYPE_NONE) then
-    begin
-      ErrorCode := ERROR_INVALID_PARAMETER;
-      ErrorMessage := 'Required parameter(s) missing. Specify --help (-h) for usage.';
-    end
-    else if (CountBits(ReqArgsAction) > 1) or (CountBits(ReqArgsPathType) > 1) then
-    begin
-      ErrorCode := ERROR_INVALID_PARAMETER;
-      ErrorMessage := 'Mutually exclusive parameter(s) specified. Specify --help (-h) for usage.';
-    end;
-  end;
-end;
-
-function TranslateErrorCode(const Code: DWORD): UnicodeString;
-begin
-  case Code of
-    ERROR_FILE_NOT_FOUND:
-      result := 'The Path value is not present in the registry. (2)';
-    ERROR_PATH_NOT_FOUND:
-      result := 'The specified directory does not exist in the Path. (3)';
-    ERROR_ALREADY_EXISTS:
-      result := 'The specified directory already exists in the Path. (183)';
-  else
-    result := GetWindowsMessage(Code, true);
-  end; //case
-end;
-
-procedure WriteOutput(const S: UnicodeString);
-begin
-  if not CommandLine.ArgQuiet then
-    if ExitCode <> 0 then
-      WriteLn(ErrOutput, S)
-    else
-      WriteLn(S);
-end;
-
-begin
-  // Parse the command line using getopts
-  CommandLine.Parse();
-
-  // --help/-h or /?
-  if CommandLine.ArgHelp or (ParamStr(1) = '/?') then
-  begin
-    Usage();
-    exit();
-  end;
-
-  ExitCode := CommandLine.ErrorCode;
-  if ExitCode <> 0 then
-  begin
-    WriteLn(CommandLine.ErrorMessage);
-    exit();
-  end;
-
-  PathType := UserPath;
-  if CommandLine.ArgPathSystem then
-    PathType := SystemPath
-  else if CommandLine.ArgPathUser then
-    PathType := UserPath;
-
-  if CommandLine.ArgAddToPath <> '' then
-  begin
-    if CommandLine.ArgAddToBeginning then
-      PathAddType := AppendPathToDir
-    else
-      PathAddType := AppendDirToPath;
-    ExitCode := wsAddDirToPath(CommandLine.ArgAddToPath, PathType, PathAddType);
-    WriteOutput(TranslateErrorCode(ExitCode));
-  end
-  else if CommandLine.ArgList then
-  begin
-    ExitCode := wsGetPath(PathType, CommandLine.ArgExpand, OutputStr);
-    if (ExitCode = 0) and (OutputStr <> '') then
-      WriteLn(OutputStr)
-    else if ExitCode <> 0 then
-      WriteOutput(TranslateErrorCode(ExitCode));
-  end
-  else if CommandLine.ArgRemoveFromPath <> '' then
-  begin
-    ExitCode := wsRemoveDirFromPath(CommandLine.ArgRemoveFromPath, PathType);
-    WriteOutput(TranslateErrorCode(ExitCode));
-  end
-  else if CommandLine.ArgTest <> '' then
-  begin
-    OutputStr := '';
-    ExitCode := wsIsDirInPath(CommandLine.ArgTest, PathType, PathFindType);
-    if ExitCode = 0 then
-    begin
-      case PathFindType of
-        FoundInUnexpandedPath:
-        begin
-          ExitCode := LongInt(FoundInUnexpandedPath);
-          OutputStr := 'The specified directory exists in the unexpanded Path. (1)';
-        end;
-        FoundInExpandedPath:
-        begin
-          ExitCode := LongInt(FoundInExpandedPath);
-          OutputStr := 'The specified directory exists in the expanded Path. (2)';
-        end;
-      end; //case
-    end;
-    if OutputStr <> '' then
-      WriteOutput(OutputStr)
-    else
-      WriteOutput(TranslateErrorCode(ExitCode));
-  end;
-
-end.
diff --git a/EditPath.rc b/EditPath.rc
deleted file mode 100644
index c071c8d..0000000
--- a/EditPath.rc
+++ /dev/null
@@ -1,29 +0,0 @@
-1 VERSIONINFO
-FILEVERSION 4,0,4,0
-PRODUCTVERSION 4,0,4,0
-FILEOS 0x4
-FILETYPE 1
-{
-  BLOCK "StringFileInfo"
-  {
-    BLOCK "040904E4"
-    {
-      VALUE "CompanyName", ""
-      VALUE "FileDescription", "EditPath.exe"
-      VALUE "FileVersion", "4.0.4.0"
-      VALUE "InternalName", "EditPath.exe"
-      VALUE "LegalCopyright", "Copyright 2004-2023 by Bill Stewart (bstewart at iname.com)"
-      VALUE "OriginalFilename", "EditPath.exe"
-      VALUE "ProductName", ""
-      VALUE "ProductVersion", "4.0.4.0"
-    }
-  }
-
-  BLOCK "VarFileInfo"
-  {
-    VALUE "Translation", 0x0409, 0x04E4
-  }
-}
-
-APPICON ICON "EditPath.ico"
-MAINICON ICON "EditPath.ico"
diff --git a/PathMan.ico b/PathMan.ico
new file mode 100644
index 0000000..2801cae
Binary files /dev/null and b/PathMan.ico differ
diff --git a/EditPath.iss b/PathMan.iss
similarity index 92%
rename from EditPath.iss
rename to PathMan.iss
index b70d571..62fd363 100644
--- a/EditPath.iss
+++ b/PathMan.iss
@@ -1,4 +1,4 @@
-; Copyright (C) 2021-2023 by Bill Stewart (bstewart at iname.com)
+; Copyright (C) 2021-2024 by Bill Stewart (bstewart at iname.com)
 ;
 ; This program is free software; you can redistribute it and/or modify it under
 ; the terms of the GNU Lesser General Public License as published by the Free
@@ -32,14 +32,15 @@
 #endif
 
 [Setup]
-AppId={{A17D2D05-C729-4F2A-9CC7-E04906C5A842}
-AppName=EditPath
-AppVersion=4.0.4.0
+AppId={{82425B5C-8B45-4F8C-9830-3D8E2DB64581}
+AppName=PathMan
+AppVersion=2.0.0.0
 UsePreviousAppDir=false
-DefaultDirName={autopf}\EditPath
+DefaultDirName={autopf}\PathMan
+ChangesEnvironment=yes
 Uninstallable=true
 OutputDir=.
-OutputBaseFilename=EditPath_Setup
+OutputBaseFilename=PathMan-Setup
 ArchitecturesInstallIn64BitMode=x64
 PrivilegesRequired=none
 PrivilegesRequiredOverridesAllowed=dialog
@@ -52,9 +53,9 @@ PrivilegesRequiredOverridesAllowed=dialog
 Source: "i386\PathMgr.dll";  DestDir: "{app}"; Flags: uninsneveruninstall
 
 ; Other files to install on target system
-Source: "i386\EditPath.exe";   DestDir: "{app}"; Check: not Is64BitInstallMode()
-Source: "x86_64\EditPath.exe"; DestDir: "{app}"; Check: Is64BitInstallMode()
-Source: "EditPath.md";         DestDir: "{app}"
+Source: "i386\PathMan.exe";   DestDir: "{app}"; Check: not Is64BitInstallMode()
+Source: "x86_64\PathMan.exe"; DestDir: "{app}"; Check: Is64BitInstallMode()
+Source: "PathMan.md";         DestDir: "{app}"
 
 [Tasks]
 Name: modifypath; Description: "&Add to Path"
diff --git a/PathMan.md b/PathMan.md
new file mode 100644
index 0000000..d9ff139
--- /dev/null
+++ b/PathMan.md
@@ -0,0 +1,141 @@
+# PathMan
+
+PathMan is a Windows console (text-based, command-line) program for managing the system Path and user Path.
+
+# Author
+
+Bill Stewart - bstewart at iname dot com
+
+# License
+
+PathMan.exe is covered by the GNU Lesser Public License (LPGL). See the file `LICENSE` for details.
+
+# Download
+
+https://github.com/Bill-Stewart/PathMgr/releases/
+
+# Background
+
+The system Path is found in the following location in the Windows registry:
+
+Root: `HKEY_LOCAL_MACHINE`  
+Subkey: `SYSTEM\CurrentControlSet\Control\Session Manager\Environment`  
+Value name: `Path`  
+Value type: `REG_EXPAND_SZ`
+
+The current user Path is found in the following location in the registry:
+
+Root: `HKEY_CURRENT_USER`  
+Subkey: `Environment`  
+Value name: `Path`  
+Value type: `REG_EXPAND_SZ`
+
+The registry value type `REG_EXPAND_SZ` means the string caan contain values surrounded by `%` characters that Windows will automatically expand to environment variable values. (For example, `%SystemRoot%` will be expanded to `C:\Windows` on most systems.)
+
+The `Path` value contains a `;`-delimited list of directory names that the operating system should search for executables, library files, scripts, etc. Windows appends the content of the current user Path to the system Path, and expands the environment variable references, and sets the resulting string as the `Path` environment variable for new processes.
+
+PathMan provides a command-line interface for managing the `Path` value in the system location (in `HKEY_LOCAL_MACHINE`) and the current user location (in `HKEY_CURRENT_USER`).
+
+# Usage
+
+The following describes the command-line usage for the program. Parameters are case-sensitive.
+
+**PathMan** _scope_ _action_ [_option_ [...]]
+
+You must specify only one of the following _scope_ parameters:
+
+| _scope_      | Abbreviation | Description
+| -------      | ------------ | -----------
+| **--system** | **-s**       | Specifies the system Path
+| **--user**   | **-u**       | Specifies the current user Path
+
+You must specify only one of the following _action_ parameters:
+
+| _action_                     | Abbreviation           | Description
+| --------                     | ------------           | -----------
+| **--list**                   | **-l**                 | Lists directories in Path
+| **--test "**_dirname_**"**   | **-t "**_dirname_**"** | Tests if directory is in Path
+| **--add "**_dirname_**"**    | **-a "**_dirname_**"** | Adds directory to Path
+| **--remove "**_dirname_**"** | **-r "**_dirname_**"** | Removes directory from Path
+
+The following parameters are optional:
+
+| _option_        | Abbreviation | Description
+| ---------       | ------------ | -----------
+| **--expand**    | **-x**       | Expands environment variables (**--list** only)
+| **--beginning** | **-b**       | Adds to beginning of Path (**--add** only)
+| **--quiet**     | **-q**       | Suppresses result and error messages
+
+# Exit Codes
+
+The following table lists typical exit codes when not using **--test** (**-t**):
+
+| Exit Code | Description
+| --------- | -----------
+| 0         | No errors
+| 2         | The Path value is missing from the registry
+| 3         | The specified directory does not exist in the Path
+| 5         | Access is denied
+| 87        | Incorrect parameter(s)
+| 183       | The specified directory already exists in the Path
+
+The following table lists typical exit codes when using **--test** (**-t**):
+
+| Exit Code | Description
+| --------- | -----------
+| 1         | The specified directory exists in the unexpanded Path
+| 2         | The specified directory exists in the expanded Path
+| 3         | The specified directory does not exist in the Path
+
+# Remarks
+
+*   "Unexpanded" vs. "expanded" refers to whether PathMan expands environment variable references (i.e., names between `%` characters) after retrieving the Path value from the registry. For example, `%SystemRoot%` is unexpanded but `C:\Windows` is expanded.
+
+*   The **--add** (**-a**) parameter checks whether the specified directory exists in both the unexpanded and expanded copies of the Path before adding the directory. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--add C:\TestApp` will return exit code 183 (i.e., the directory already exists in the Path) because `%TESTAPP%` expands to `C:\TestApp`.
+
+*   The **--remove** (**-r**) parameter does not expand environment variable references. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--remove "C:\TestApp"` will return exit code 3 (i.e., the directory does not exist in the Path) because **--remove** does not expand `%TESTAPP%` to `C:\TestApp`. For the command to succeed, you would have to specify `--remove "%TESTAPP%"` instead.
+
+*   The program will exit with error code 87 if a parameter (or an argument to a parameter) is missing or not valid, if mutually exclusive parameters are specified, etc.
+
+*   The program will exit with error code 5 if the current user does not have permission to update the Path value in the registry (for example, if you try to update the system Path using a standard user account or an unelevated administrator account).
+
+*   Working with environment variable strings at the cmd.exe command prompt can be tricky because cmd.exe always expands environment variable references. One way to work around this is to set a temporary environment variable using the `^` character to escape each `%` character, then use the temporary environment variable in the PathMan command. See **Examples**, below, for an example. This issue doesn't occur in PowerShell because PowerShell doesn't expand environment variables names enclosed in `%` characters.
+
+*   If a directory name contains the `;` character, PathMan will add it to the Path in the registry with surrounding quote characters (`"`). The quotes around the directory name are required to inform the operating system that the enclosed string is a single directory name. For example, consider the following Path string:
+
+        C:\dir 1;"C:\dir;2";C:\dir3
+
+    Without the quote marks enclosing the `C:\dir;2` directory, the system would incorrectly "split" the path name into the following directory names:
+
+        C:\dir 1
+        C:\dir
+        2
+        C:\dir3
+
+    In other words, the `"` characters around the `C:\dir;2` directory "protect" the `;` character and inform the system that `C:\dir;2` is a single directory name. (The `"` marks themselves are not part of the directory name.)
+
+# Examples
+
+1.  List directories in the system Path, expanding all environment varable references:
+
+        PathMan --system --list --expand
+
+    You can also write this command as `PathMan -s -l -x`.
+
+2.  Add a directory to the current user from the cmd.exe command line:
+
+        set _T=^%LOCALAPPDATA^%
+        PathMan --user --add "%_T%\Programs\My App"
+        set _T=
+
+    This sequence of commands adds the directory `%LOCALAPPDATA%\Programs\My App` to the current user Path. The first command sets a temporary environment variable to the literal string `%LOCALAPPDATA%` (the `^` characters "escape" the `%` characters). The second command adds the directory to the current user Path (cmd.exe expands `%_T%` to the literal string `%LOCALAPPDATA%`), and the third command removes the temporary variable from the environment.
+
+3.  Remove a directory from the system Path:
+
+        PathMan -s -r "C:\Program Files\MyApp\bin"
+
+4. Tests if a directory is in the path:
+
+        PathMan -s --test "C:\Program Files (x86)\MyApp\bin"
+
+    This command returns an exit code of 3 if the specified directory is not in the system Path, 1 if the specified directory is in the unexpanded copy of the system Path, or 2 if the specified directory is in the expanded copy of the system Path.
diff --git a/PathMan.pp b/PathMan.pp
new file mode 100644
index 0000000..b161f6d
--- /dev/null
+++ b/PathMan.pp
@@ -0,0 +1,379 @@
+{ Copyright (C) 2024 by Bill Stewart (bstewart at iname.com)
+
+  This program is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the Free
+  Software Foundation; either version 3 of the License, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
+  details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program. If not, see https://www.gnu.org/licenses/.
+
+}
+
+program PathMan;
+
+{$MODE OBJFPC}
+{$MODESWITCH UNICODESTRINGS}
+{$R *.res}
+
+// wargcv and wgetopts: https://github.com/Bill-Stewart/wargcv
+uses
+  windows,
+  wargcv,
+  wgetopts,
+  WindowsMessages,
+  WindowsPath;
+
+const
+  PROGRAM_NAME = 'PathMan';
+  PROGRAM_COPYRIGHT = 'Copyright (C) 2024 by Bill Stewart';
+
+type
+  // Must specify only one action param,
+  TActionParamGroup = (
+    ActionParamAdd,
+    ActionParamHelp,
+    ActionParamList,
+    ActionParamRemove,
+    ActionParamTest);
+  TActionParamSet = set of TActionParamGroup;
+  // ...and only one scope param
+  TScopeParamGroup = (
+    ScopeParamSystem,
+    ScopeParamUser);
+  TScopeParamSet = set of TScopeParamGroup;
+  TCommandLine = object
+    ActionParamSet: TActionParamSet;
+    ScopeParamSet: TScopeParamSet;
+    Error: DWORD;
+    AddBeginning: Boolean;
+    Expand: Boolean;
+    Quiet: Boolean;
+    DirName: string;
+    procedure Parse();
+  end;
+
+function IntToStr(const I: Integer): string;
+begin
+  Str(I, result);
+end;
+
+function GetFileVersion(const FileName: string): string;
+var
+  VerInfoSize, Handle: DWORD;
+  pBuffer: Pointer;
+  pFileInfo: ^VS_FIXEDFILEINFO;
+  Len: UINT;
+begin
+  result := '';
+  VerInfoSize := GetFileVersionInfoSizeW(PChar(FileName),  // LPCWSTR lptstrFilename
+    Handle);                                               // LPDWORD lpdwHandle
+  if VerInfoSize > 0 then
+  begin
+    GetMem(pBuffer, VerInfoSize);
+    if GetFileVersionInfoW(PChar(FileName),  // LPCWSTR lptstrFilename
+      Handle,                                // DWORD   dwHandle
+      VerInfoSize,                           // DWORD   dwLen
+      pBuffer) then                          // LPVOID  lpData
+    begin
+      if VerQueryValueW(pBuffer,  // LPCVOID pBlock
+        '\',                      // LPCWSTR lpSubBlock
+        pFileInfo,                // LPVOID  *lplpBuffer
+        Len) then                 // PUINT   puLen
+      begin
+        with pFileInfo^ do
+        begin
+          result := IntToStr(HiWord(dwFileVersionMS)) + '.' +
+            IntToStr(LoWord(dwFileVersionMS)) + '.' +
+            IntToStr(HiWord(dwFileVersionLS));
+          // LoWord(dwFileVersionLS) intentionally omitted
+        end;
+      end;
+    end;
+    FreeMem(pBuffer);
+  end;
+end;
+
+procedure Usage();
+begin
+  WriteLn(PROGRAM_NAME, ' ', GetFileVersion(ParamStr(0)), ' - ', PROGRAM_COPYRIGHT);
+  WriteLn('This is free software and comes with ABSOLUTELY NO WARRANTY.');
+  WriteLn();
+  WriteLn('SYNOPSIS');
+  WriteLn();
+  WriteLn('Provides tools for management of the Path environment variable.');
+  WriteLn();
+  WriteLn('USAGE');
+  WriteLn();
+  WriteLn(PROGRAM_NAME, ' <scope> <action> <option> [<option> [...]]');
+  WriteLn();
+  WriteLn('<scope>   Abbrev.  Description');
+  WriteLn('--------------------------------------------------');
+  WriteLn('--system  -s       Specifies system Path');
+  WriteLn('--user    -u       Specifies the current user Path');
+  WriteLn();
+  WriteLn('<action>            Abbrev.       Description');
+  WriteLn('---------------------------------------------------------------');
+  WriteLn('--list              -l            Lists directories in Path');
+  WriteLn('--test "dirname"    -t "dirname"  Tests if directory is in Path');
+  WriteLn('--add "dirname"     -a "dirname"  Adds directory to Path');
+  WriteLn('--remove "dirname"  -r "dirname"  Removes directory from Path');
+  WriteLn();
+  WriteLn('<option>     Abbrev.  Description');
+  WriteLn('-----------------------------------------------------------------');
+  WriteLn('--expand     -x       Expands environment variables (--list only)');
+  WriteLn('--beginning  -b       Adds to beginning of path (--add only)');
+  WriteLn('--quiet      -q       Suppresses result and error messages');
+  WriteLn();
+  WriteLn('EXIT CODES');
+  WriteLn();
+  WriteLn('Typical exit codes when not using --test:');
+  WriteLn('0 - No errors');
+  WriteLn('2 - The Path value is missing from the registry');
+  WriteLn('3 - The specified directory does not exist in the Path');
+  WriteLn('5 - Access is denied');
+  WriteLn('87 - Incorrect parameter(s)');
+  WriteLn('183 - The specified directory already exists in the Path');
+  WriteLn();
+  WriteLn('Typical exit codes when using --test:');
+  WriteLn('1 - The specified directory exists in the unexpanded Path');
+  WriteLn('2 - The specified directory exists in the expanded Path');
+  WriteLn('3 - The specified directory does not exist in the Path');
+end;
+
+procedure TCommandLine.Parse();
+var
+  Opts: array[1..11] of TOption;
+  Opt: Char;
+  I: Integer;
+begin
+  with Opts[1] do
+  begin
+    Name := 'add';
+    Has_arg := Required_Argument;
+    Flag := nil;
+    Value := 'a';
+  end;
+  with Opts[2] do
+  begin
+    Name := 'beginning';
+    Has_arg := No_Argument;
+    Flag := nil;
+    Value := 'b';
+  end;
+  with Opts[3] do
+  begin
+    Name := 'expand';
+    Has_arg := No_Argument;
+    Flag := nil;
+    value := 'x';
+  end;
+  with Opts[4] do
+  begin
+    Name := 'help';
+    Has_arg := No_Argument;
+    Flag := nil;
+    Value := 'h';
+  end;
+  with Opts[5] do
+  begin
+    Name := 'list';
+    Has_arg := No_Argument;
+    Flag := nil;
+    Value := 'l';
+  end;
+  with Opts[6] do
+  begin
+    Name := 'quiet';
+    Has_arg := No_Argument;
+    Flag := nil;
+    Value := 'q';
+  end;
+  with Opts[7] do
+  begin
+    Name := 'remove';
+    Has_arg := Required_Argument;
+    Flag := nil;
+    Value := 'r';
+  end;
+  with Opts[8] do
+  begin
+    Name := 'system';
+    Has_arg := No_Argument;
+    Flag := nil;
+    Value := 's';
+  end;
+  with Opts[9] do
+  begin
+    Name := 'test';
+    Has_arg := Required_Argument;
+    Flag := nil;
+    Value := 't';
+  end;
+  with Opts[10] do
+  begin
+    Name := 'user';
+    Has_arg := No_Argument;
+    Flag := nil;
+    Value := 'u';
+  end;
+  with Opts[11] do
+  begin
+    Name := '';
+    Has_arg := No_Argument;
+    Flag := nil;
+    Value := #0;
+  end;
+  ActionParamSet := [];
+  ScopeParamSet := [];
+  Error := ERROR_SUCCESS;
+  AddBeginning := false;
+  Expand := false;
+  Quiet := false;
+  DirName := '';
+  OptErr := false;
+  repeat
+    Opt := GetLongOpts('a:bxhlqr:st:u', @Opts[1], I);
+    case Opt of
+      'a':
+      begin
+        DirName := OptArg;
+        Include(ActionParamSet, ActionParamAdd);
+      end;
+      'b': AddBeginning := true;
+      'x': Expand := true;
+      'h':
+      begin
+        Include(ActionParamSet, ActionParamHelp);
+        break;
+      end;
+      'l': Include(ActionParamSet, ActionParamList);
+      'q': Quiet := true;
+      'r':
+      begin
+        DirName := OptArg;
+        Include(ActionParamSet, ActionParamRemove);
+      end;
+      's': Include(ScopeParamSet, ScopeParamSystem);
+      't':
+      begin
+        DirName := OptArg;
+        Include(ActionParamSet, ActionParamTest);
+      end;
+      'u': Include(ScopeParamSet, ScopeParamUser);
+      '?':
+      begin
+        Error := ERROR_INVALID_PARAMETER;
+        break;
+      end;
+    end;
+  until Opt = EndOfOptions;
+  if Error <> ERROR_SUCCESS then
+    exit;
+  // Must specify only one action param and only one scope param
+  if (PopCnt(DWORD(ActionParamSet)) <> 1) or (PopCnt(DWORD(ScopeParamSet)) <> 1) then
+    Error := ERROR_INVALID_PARAMETER;
+end;
+
+var
+  RC: DWORD;
+  CmdLine: TCommandLine;
+  PathType: TPathType;
+  Path: string;
+  FindType: TPathFindType;
+  AddType: TPathAddType;
+
+begin
+  RC := ERROR_SUCCESS;
+
+  CmdLine.Parse();
+
+  if (ParamCount = 0) or (ActionParamHelp in CmdLine.ActionParamSet) then
+  begin
+    Usage();
+    exit;
+  end;
+
+  if CmdLine.Error <> ERROR_SUCCESS then
+  begin
+    RC := CmdLine.Error;
+    if not CmdLine.Quiet then
+      WriteLn(GetWindowsMessage(RC, true));
+    ExitCode := Integer(RC);
+    exit;
+  end;
+
+  if ScopeParamSystem in CmdLine.ScopeParamSet then
+    PathType := PathTypeSystem
+  else
+    PathType := PathTypeUser;
+
+  if ActionParamList in CmdLine.ActionParamSet then
+  begin
+    RC := GetPath(PathType, CmdLine.Expand, Path);
+    if RC = ERROR_SUCCESS then
+    begin
+      if Path <> '' then
+        WriteLn(Path);
+    end
+    else
+      WriteLn(GetWindowsMessage(RC, true));
+  end;
+
+  if ActionParamTest in CmdLine.ActionParamSet then
+  begin
+    RC := IsDirInPath(CmdLine.DirName, PathType, FindType);
+    if RC = ERROR_SUCCESS then
+    begin
+      case FindType of
+        PathFindTypeUnexpanded:
+        begin
+          RC := 1;
+          if not CmdLine.Quiet then
+            WriteLn('The specified directory exists in the unexpanded Path. (1)');
+        end;
+        PathFindTypeExpanded:
+        begin
+          RC := 2;
+          if not CmdLine.Quiet then
+            WriteLn('The specified directory exists in the expanded Path. (2)');
+        end;
+      end;
+    end
+    else  // RC <> ERROR_SUCCESS
+    begin
+      if not CmdLine.Quiet then
+      begin
+        if (RC = ERROR_PATH_NOT_FOUND) and (FindType = PathFindTypeNotFound) then
+          WriteLn('The specified directory was not found in the Path. (3)')
+        else
+          WriteLn(GetWindowsMessage(RC, true));
+      end;
+    end;
+  end;
+
+  if ActionParamAdd in CmdLine.ActionParamSet then
+  begin
+    if CmdLine.AddBeginning then
+      AddType := PathAddTypeBeginning
+    else
+      AddType := PathAddTypeEnd;
+    RC := AddDirToPath(CmdLine.DirName, PathType, AddType);
+    if not CmdLine.Quiet then
+      WriteLn(GetWindowsMessage(RC, true));
+  end;
+
+  if ActionParamRemove in CmdLine.ActionParamSet then
+  begin
+    RC := RemoveDirFromPath(CmdLine.DirName, PathType);
+    if not CmdLine.Quiet then
+      WriteLn(GetWindowsMessage(RC, true));
+  end;
+
+  ExitCode := Integer(RC);
+end.
diff --git a/PathMan.rc b/PathMan.rc
new file mode 100644
index 0000000..84f2c50
--- /dev/null
+++ b/PathMan.rc
@@ -0,0 +1,29 @@
+1 VERSIONINFO
+FILEVERSION 2,0,0,0
+PRODUCTVERSION 2,0,0,0
+FILEOS 0x4
+FILETYPE 1
+{
+  BLOCK "StringFileInfo"
+  {
+    BLOCK "040904E4"
+    {
+      VALUE "CompanyName", "Bill Stewart (bstewart at iname.com)"
+      VALUE "FileDescription", "PathMan.exe"
+      VALUE "FileVersion", "2.0.0.0"
+      VALUE "InternalName", "PathMan.exe"
+      VALUE "LegalCopyright", "(C) 2024 by Bill Stewart (bstewart at iname.com)"
+      VALUE "OriginalFilename", "PathMan.exe"
+      VALUE "ProductName", "PathMan.exe"
+      VALUE "ProductVersion", "2.0.0.0"
+    }
+  }
+
+  BLOCK "VarFileInfo"
+  {
+    VALUE "Translation", 0x0409, 0x04E4
+  }
+}
+
+APPICON ICON "PathMan.ico"
+MAINICON ICON "PathMan.ico"
diff --git a/PathMgr.pp b/PathMgr.pp
index 0c3a1ca..9763b1e 100644
--- a/PathMgr.pp
+++ b/PathMgr.pp
@@ -1,4 +1,4 @@
-{ Copyright (C) 2021 by Bill Stewart (bstewart at iname.com)
+{ Copyright (C) 2021-2024 by Bill Stewart (bstewart at iname.com)
 
   This program is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the Free
@@ -16,61 +16,64 @@
 }
 
 {$MODE OBJFPC}
-{$H+}
+{$MODESWITCH UNICODESTRINGS}
 {$R *.res}
 
 library PathMgr;
 
 uses
   Windows,
-  wsPathMgr;
+  WindowsPath;
 
-procedure CopyString(const Source: UnicodeString; Dest: PWideChar);
+procedure CopyString(const Source: string; Dest: PChar);
 var
   NumChars: DWORD;
 begin
   NumChars := Length(Source);
-  Move(Source[1], Dest^, NumChars * SizeOf(WideChar));
+  Move(Source[1], Dest^, NumChars * SizeOf(Char));
   Dest[NumChars] := #0;
 end;
 
-function AddDirToPath(const DirName: PWideChar; const PathType, AddType: DWORD): DWORD; stdcall;
-begin
-  if (PathType > 1) or (AddType > 1) then
-    exit(ERROR_INVALID_PARAMETER);
-  result := wsAddDirToPath(DirName, TPathType(PathType), TPathAddType(AddType));
-end;
-
-function GetPath(const PathType, Expand: DWORD; Buffer: PWideChar; const NumChars: DWORD): DWORD; stdcall;
+function GetPath(PathType, Expand: DWORD; Buffer: PChar; NumChars: DWORD): DWORD; stdcall;
 var
-  Path: UnicodeString;
+  Path: string;
 begin
-  result := 0;
   if PathType > 1 then
-    exit();
-  if wsGetPath(TPathType(PathType), Expand <> 0, Path) = 0 then
+    PathType := 1;
+  if WindowsPath.GetPath(TPathType(PathType), Expand <> 0, Path) = ERROR_SUCCESS then
   begin
-    if (Length(Path) > 0) and Assigned(Buffer) and (NumChars >= Length(Path)) then
-      CopyString(Path, Buffer);
     result := Length(Path);
-  end;
+    if (result > 0) and (result <= NumChars) and Assigned(Buffer) then
+      CopyString(Path, Buffer);
+  end
+  else
+    result := 0;
 end;
 
-function IsDirInPath(const DirName: PWideChar; const PathType: DWORD; FindType: PDWORD): DWORD; stdcall;
+function IsDirInPath(DirName: PChar; PathType: DWORD; FindType: PDWORD): DWORD; stdcall;
 var
   PathFindType: TPathFindType;
 begin
   if PathType > 1 then
-    exit(ERROR_INVALID_PARAMETER);
-  result := wsIsDirInPath(DirName, TPathType(PathType), PathFindType);
+    PathType := 1;
+  result := WindowsPath.IsDirInPath(string(DirName), TPathType(PathType), PathFindType);
   FindType^ := DWORD(PathFindType);
 end;
 
-function RemoveDirFromPath(const DirName: PWideChar; const PathType: DWORD): DWORD; stdcall;
+function AddDirToPath(DirName: PChar; PathType, AddType: DWORD): DWORD; stdcall;
+begin
+  if PathType > 1 then
+    PathType := 1;
+  if AddType > 1 then
+    AddType := 1;
+  result := WindowsPath.AddDirToPath(string(DirName), TPathType(PathType), TPathAddType(AddType));
+end;
+
+function RemoveDirFromPath(DirName: PChar; PathType: DWORD): DWORD; stdcall;
 begin
   if PathType > 1 then
-    exit(ERROR_INVALID_PARAMETER);
-  result := wsRemoveDirFromPath(DirName, TPathType(PathType));
+    PathType := 1;
+  result := WindowsPath.RemoveDirFromPath(string(DirName), TPathType(PathType));
 end;
 
 exports
diff --git a/PathMgr.ps1 b/PathMgr.ps1
index 69ec985..14f0f29 100644
--- a/PathMgr.ps1
+++ b/PathMgr.ps1
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023 by Bill Stewart (bstewart at iname.com)
+# Copyright (C) 2021-2024 by Bill Stewart (bstewart at iname.com)
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Lesser General Public License as published by the Free
@@ -188,13 +188,24 @@ function RemoveDirFromPath {
   $PathMgr::RemoveDirFromPath($dirName,$intPathType)
 }
 
-function GetMessageFromID {
+# Outputs the message associated with a message id; -asError parameter causes
+# output as an error message - "Error <n> (0x<n>) - <message>"
+function Get-MessageDescription {
   param(
-    [UInt32]
-    $messageID
+    $messageId,
+
+    [Switch]
+    $asError
   )
-  $stdOut = & "$env:SystemRoot\System32\net.exe" helpmsg $messageID | Out-String -Width ([Int32]::MaxValue)
-  "{0} - {1}" -f $messageID,($stdOut -replace [Environment]::NewLine,"")
+  # message id must be Int32
+  $intId = [BitConverter]::ToInt32([BitConverter]::GetBytes($messageId),0)
+  $message = ([ComponentModel.Win32Exception] $intId).Message
+  if ( $asError ) {
+    "{0} ({1})" -f $message,$messageId
+  }
+  else {
+    "{0}" -f $message
+  }
 }
 
 $ExitCode = 0
@@ -212,11 +223,12 @@ switch ( $PSCmdlet.ParameterSetName ) {
   }
   "Add" {
     $ExitCode = AddDirToPath $PathType $Add -Beginning:$Beginning
-    GetMessageFromId $ExitCode
+    Get-MessageDescription $ExitCode -asError:($ExitCode -ne 0)
   }
   "Remove" {
     $ExitCode = RemoveDirFromPath $PathType $Remove
-    GetMessageFromId $ExitCode
+    Get-MessageDescription $ExitCode -asError:($ExitCode -ne 0)
   }
 }
+
 exit $ExitCode
diff --git a/PathMgr.rc b/PathMgr.rc
index 13e6603..5105b57 100644
--- a/PathMgr.rc
+++ b/PathMgr.rc
@@ -1,8 +1,8 @@
 1 VERSIONINFO
-FILEVERSION 1,0,4,0
-PRODUCTVERSION 1,0,4,0
+FILEVERSION 2,0,0,0
+PRODUCTVERSION 2,0,0,0
 FILEOS 0x4
-FILETYPE 1
+FILETYPE 2
 {
   BLOCK "StringFileInfo"
   {
@@ -10,12 +10,12 @@ FILETYPE 1
     {
       VALUE "CompanyName", ""
       VALUE "FileDescription", "PathMgr.dll"
-      VALUE "FileVersion", "1.0.4.0"
+      VALUE "FileVersion", "2.0.0.0"
       VALUE "InternalName", "PathMgr.dll"
-      VALUE "LegalCopyright", "Copyright 2021-2023 by Bill Stewart (bstewart at iname.com)"
+      VALUE "LegalCopyright", "Copyright 2021-2024 by Bill Stewart (bstewart at iname.com)"
       VALUE "OriginalFilename", "PathMgr.dll"
       VALUE "ProductName", ""
-      VALUE "ProductVersion", "1.0.4.0"
+      VALUE "ProductVersion", "2.0.0.0"
     }
   }
 
diff --git a/README.md b/README.md
index c72d07d..8debaaa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# PathMgr.dll
+# PathMgr/PathMan
 
-PathMgr.dll is a Windows DLL (dynamically linked library) for managing the system Path and user Path.
+PathMgr.dll is a Windows DLL (dynamically linked library) for managing the directories in the system Path and user Path. PathMan.exe is a command-line equivalent.
 
 # Author
 
@@ -8,7 +8,7 @@ Bill Stewart - bstewart at iname dot com
 
 # License
 
-PathMgr.dll is covered by the GNU Lesser Public License (LPGL). See the file `LICENSE` for details.
+PathMgr.dll and PathMan.exe are covered by the GNU Lesser Public License (LPGL). See the file `LICENSE` for details.
 
 # Download
 
@@ -36,7 +36,7 @@ PathMgr.dll provides an API for managing the `Path` value in the system location
 
 PathMgr.dll is designed for applications (such as installers) that don't provide a built-in set of APIs or interfaces to manage the system or current user Path. There are both 32-bit (x86) and 64-bit (x64) versions.
 
-If you prefer, the EditPath program is a command-line tool that provides the same functionality as PathMgr.dll. (EditPath does not require PathMgr.dll.)
+If you prefer, the Pathman.exe program is a command-line tool that provides the same functionality as PathMgr.dll in a single executable (i.e., PathMan.exe does not require PathMgr.dll).
 
 # Functions
 
@@ -44,9 +44,9 @@ This section documents the functions exported by PathMgr.dll.
 
 ---
 
-## AddDirToPath()
+## AddDirToPath
 
-The `AddDirToPath()` function adds a directory to the Path.
+The `AddDirToPath` function adds a directory to the Path.
 
 ### Syntax
 
@@ -78,23 +78,32 @@ Specify 0 to add the directory to the end of the Path or 1 to add the directory
 
 If the specified directory already exists in the Path, the function returns `ERROR_ALREADY_EXISTS` (183). Otherwise, the function returns 0 for success or non-zero for failure.
 
-The function returns `ERROR_INVALID_PARAMETER` (87) for any of the following cases:
-
-* `DirName` specifies an invalid directory name
-* `PathType` is not a valid value
-* `AddType` is not a valid value
+The function will return `ERROR_INVALID_PARAMETER` (87) if the `DirName` parameter specifies an invalid directory name.
 
 Updating the system Path requires administrative permissions; if you attempt to update the system Path from an unelevated process, the function will return `ERROR_ACCESS_DENIED` (5).
 
 ### Remarks
 
-The `AddDirToPath()` function checks whether the directory name exists in both the unexpanded and expanded copies of the Path. For example, if one of the directories in the Path is `%TESTAPP%`, and the `TESTAPP` environment variable is set to `C:\Test`, the function will return `ERROR_ALREADY_EXISTS` (183) if you specify either `%TESTAPP%` or `C:\Test` for the `DirName` parameter.
+The `AddDirToPath` function checks whether the directory name exists in both the unexpanded and expanded copies of the Path. For example, if one of the directories in the Path is `%TESTAPP%`, and the `TESTAPP` environment variable is set to `C:\Test`, the function will return `ERROR_ALREADY_EXISTS` (183) if you specify either `%TESTAPP%` or `C:\Test` for the `DirName` parameter.
+
+If a directory name contains the `;` character, the `AddDirToPath` function will add it to the Path in the registry with surrounding quote characters (`"`). The quotes around the directory name are required to inform the operating system that the enclosed string is a single directory name. For example, consider the following Path string:
+
+    C:\dir 1;"C:\dir;2";C:\dir3
+
+Without the quote marks enclosing the `C:\dir;2` directory, the system would incorrectly "split" the path name into the following directory names:
+
+    C:\dir 1
+    C:\dir
+    2
+    C:\dir3
+
+In other words, the `"` characters around the `C:\dir;2` directory "protect" the `;` character and inform the system that `C:\dir;2` is a single directory name. (The `"` marks themselves are not part of the directory name.)
 
 ---
 
-## GetPath()
+## GetPath
 
-The `GetPath()` function retrieves a newline-delimited list of directories in the Path.
+The `GetPath` function retrieves a newline-delimited list of directories in the Path.
 
 ### Syntax
 
@@ -132,9 +141,9 @@ The function returns zero if it failed, or non-zero if it succeeded.
 
 ---
 
-## IsDirInPath()
+## IsDirInPath
 
-The `IsDirInPath()` function checks whether a directory exists in the Path.
+The `IsDirInPath` function checks whether a directory exists in the Path.
 
 ### Syntax
 
@@ -177,7 +186,7 @@ The function returns `ERROR_INVALID_PARAMETER` (87) for any of the following cas
 
 ### Remarks
 
-The `IsDirInPath()` function tests whether the directory name exists in the unexpanded Path (i.e., the Path value extracted from the registry without expanding any environment variable references). If the directory name exists in the unexpanded Path, the function will return 0 and the variable pointed to by the `FindType` parameter will be set to 1.
+The `IsDirInPath` function tests whether the directory name exists in the unexpanded Path (i.e., the Path value extracted from the registry without expanding any environment variable references). If the directory name exists in the unexpanded Path, the function will return 0 and the variable pointed to by the `FindType` parameter will be set to 1.
 
 If the directory name does not exist in the unexpanded Path, the function then expands the environment variable references in the directory name and and the Path. If the expanded directory name exists in the expanded Path, the function will return 0 and the variable pointed to by the `FindType` parameter will be set to 2.
 
@@ -192,7 +201,7 @@ and given the function parameters:
 * `DirName`: %SystemRoot%
 * `PathType`: 0
 
-`IsDirInPath()` will return 0 and the variable pointed to by the `FindType` parameter will be set to 1, because the directory name in the `DirName` parameter exists in the unexpanded copy of the system Path.
+`IsDirInPath` will return 0 and the variable pointed to by the `FindType` parameter will be set to 1, because the directory name in the `DirName` parameter exists in the unexpanded copy of the system Path.
 
 If the `%SystemRoot%` environment variable is `C:\Windows` and you specify `C:\Windows` for the `DirName` parameter, the function will also return 0 but the variable pointed to by the `FindType` parameter will be set to 2 instead of 1 because the directory name was found in the expanded copy of the system Path.
 
@@ -207,15 +216,15 @@ and given the function parameters:
 * `DirName`: C:\Users\myname\AppData\Local\Programs\My App
 * `PathType`: 1
 
-Presuming that the `LOCALAPPDATA` environment variable is `C:\Users\myname\AppData\Local`, `IsDirInPath()` will return 0 and the variable pointed to by the `FindType` parameter will be set to 2, because the directory name in the `DirName` parameter exists in the expanded copy of the current user Path.
+Presuming that the `LOCALAPPDATA` environment variable is `C:\Users\myname\AppData\Local`, `IsDirInPath` will return 0 and the variable pointed to by the `FindType` parameter will be set to 2, because the directory name in the `DirName` parameter exists in the expanded copy of the current user Path.
 
 If you specify `%LOCALAPPDATA%\Programs\My App` for the `DirName` parameter, the function will also return 0 but the variable pointed to by the `FindType` parameter will be set to 1 instead of 2 because the directory name was found in the unexpanded copy of the current user Path.
 
 ---
 
-## RemoveDirFromPath()
+## RemoveDirFromPath
 
-The `RemoveDirFromPath()` function removes a directory from the Path.
+The `RemoveDirFromPath` function removes a directory from the Path.
 
 ### Syntax
 
@@ -252,4 +261,4 @@ Updating the system Path requires administrative permissions; if you attempt to
 
 ### Remarks
 
-The `RemoveDirFromPath()` function only checks whether the directory name exists in the unexpanded copy of the Path. For example, if one of the directories in the Path is `%TESTAPP%`, the `TESTAPP` environment variable is set to `C:\Test`, and you specify `C:\Test` for the `DirName` parameter, the function will return `ERROR_PATH_NOT_FOUND` (3) because `C:\Test` does not exist in the unexpanded copy of the Path.
+The `RemoveDirFromPath` function only checks whether the directory name exists in the unexpanded copy of the Path. For example, if one of the directories in the Path is `%TESTAPP%`, the `TESTAPP` environment variable is set to `C:\Test`, and you specify `C:\Test` for the `DirName` parameter, the function will return `ERROR_PATH_NOT_FOUND` (3) because `C:\Test` does not exist in the unexpanded copy of the Path.
diff --git a/WindowsPath.pp b/WindowsPath.pp
new file mode 100644
index 0000000..65a28a7
--- /dev/null
+++ b/WindowsPath.pp
@@ -0,0 +1,538 @@
+{ Copyright (C) 2024 by Bill Stewart (bstewart at iname.com)
+
+  This program is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the Free
+  Software Foundation; either version 3 of the License, or (at your option) any
+  later version.
+
+  This program is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+  FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
+  details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with this program. If not, see https://www.gnu.org/licenses/.
+
+}
+
+unit WindowsPath;
+
+{$MODE OBJFPC}
+{$MODESWITCH UNICODESTRINGS}
+
+interface
+
+uses
+  windows,
+  WindowsRegistry;
+
+type
+  TPathType = (PathTypeSystem, PathTypeUser);
+  TPathAddType = (PathAddTypeEnd, PathAddTypeBeginning);
+  TPathFindType = (PathFindTypeNotFound, PathFindTypeUnexpanded, PathFindTypeExpanded);
+
+function GetPath(const PathType: TPathType; const Expand: Boolean;
+  out Path: string): LSTATUS;
+
+function IsDirInPath(DirName: string; const PathType: TPathType;
+  out FindType: TPathFindType): LSTATUS;
+
+function AddDirToPath(DirName: string; const PathType: TPathType;
+  const PathAddType: TPathAddType): LSTATUS;
+
+function RemoveDirFromPath(DirName: string; const PathType: TPathType): LSTATUS;
+
+implementation
+
+const
+  WINDOWS_PATH_DELIMITER = ';';
+  WINDOWS_PATH_MACHINE_REGISTRY_SUBKEY = 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment';
+  WINDOWS_PATH_USER_REGISTRY_SUBKEY = 'Environment';
+  {$IFDEF DEBUG}
+  WINDOWS_PATH_REGISTRY_VALUE = 'Test';
+  {$ELSE}
+  WINDOWS_PATH_REGISTRY_VALUE = 'Path';
+  {$ENDIF}
+
+type
+  TStringArray = array of string;
+
+function ExpandEnvStrings(const S: string): string;
+var
+  NumChars, BufSize: DWORD;
+  pBuffer: PChar;
+begin
+  result := S;
+  NumChars := ExpandEnvironmentStringsW(PChar(S),  // LPCWSTR lpSrc
+    nil,                                           // LPWSTR  lpDst
+    0);                                            // DWORD   nSize
+  if NumChars = 0 then
+    exit;
+  BufSize := NumChars * SizeOf(Char);
+  GetMem(pBuffer, BufSize);
+  if ExpandEnvironmentStringsW(PChar(S),  // LPCWSTR lpSrc
+    pBuffer,                              // LPWSTR  lpDst
+    NumChars) > 0 then                    // DWORD   nSize
+  begin
+    result := string(pBuffer);
+  end;
+  FreeMem(pBuffer);
+end;
+
+function TrimPathElement(S: string; const KeepQuotes: Boolean): string;
+var
+  I, J: Integer;
+begin
+  if not KeepQuotes then
+  begin
+    // Trim leading quotes
+    I := Length(S);
+    if I > 0 then
+    begin
+      J := 1;
+      while (J <= I) and (S[J] = '"') do
+        Inc(J);
+      if J > 1 then
+        Delete(S, 1, J - 1);
+    end;
+    // Trim trailing quotes
+    I := Length(S);
+    if I > 0 then
+    begin
+      J := I;
+      while (J > 0) and (S[J] = '"') do
+        Dec(J);
+      if J <> I then
+        SetLength(S, J);
+    end;
+  end;
+  // Trim trailing tabs, spaces
+  I := Length(S);
+  if I > 0 then
+  begin
+    J := I;
+    while (J > 0) and ((S[J] = #9) or (S[J] = ' ')) do
+      Dec(J);
+    if J <> I then
+      SetLength(S, J);
+  end;
+  result := S;
+end;
+
+// Splits a Windows path string into individual path elements:
+// * Path elements are delimited by the semicolon (';') character
+// * Path elements can be enclosed in quotes (") to include ';' characters
+// * Quotes are not included in path elements
+// * Trailing whitespace is removed from path elements
+// * Empty path elements are skipped
+procedure GetPathElements(const PathString: string; var PathElements: TStringArray);
+var
+  Path: string;
+  Delims, I, NumEmpty: Integer;
+  InQuote: Boolean;
+  pD, pC: PChar;
+  PathElement: string;
+begin
+  // Copy path string to local variable (we explicitly want a copy of the
+  // passed PathString, because we are modifying it in-place by embedding
+  // nulls; if we don't copy the string, the pointer dereferencing modifies
+  // the original reference-counted copy of the string)
+  SetLength(Path, Length(PathString));
+  if PathString <> '' then
+    Move(PathString[1], Path[1], Length(PathString) * SizeOf(Char));
+  // true = keep leading and trailing quotes if present
+  Path := TrimPathElement(Path, true);
+  if Path = '' then
+  begin
+    // If path string empty, array length is zero
+    SetLength(PathElements, 0);
+    exit;
+  end;
+  // Count number of path delimiters
+  Delims := 0;
+  pD := PChar(Path);
+  InQuote := false;
+  while pD^ <> #0 do
+  begin
+    if (pD^ = WINDOWS_PATH_DELIMITER) and (not InQuote) then
+      Inc(Delims)
+    else if pD^ = '"' then
+      InQuote := not InQuote;
+    Inc(pD);
+  end;
+  // Set array length
+  SetLength(PathElements, Delims + 1);
+  // Populate array
+  I := 0;             // Current array element index
+  NumEmpty := 0;      // No empty elements yet
+  pD := PChar(Path);  // Delimiter pointer
+  pC := pD;
+  InQuote := false;
+  while pD^ <> #0 do
+  begin
+    if (pD^ = WINDOWS_PATH_DELIMITER) and (not InQuote) then
+    begin
+      pD^ := #0;  // Terminate path element string
+      Inc(pD);
+      PathElement := TrimPathElement(string(pC), false);
+      if PathElement <> '' then
+      begin
+        PathElements[I] := PathElement;
+        Inc(I);
+      end
+      else
+        Inc(NumEmpty);
+      pC := pD;
+    end
+    else if pD^ = '"' then
+    begin
+      InQuote := not InQuote;
+      Inc(pD);
+    end
+    else
+      Inc(pD);
+  end;
+  // Final path element
+  PathElement := TrimPathElement(string(pC), false);
+  if PathElement <> '' then
+    PathElements[I] := PathElement
+  else
+    Inc(NumEmpty);
+  // Drop empty elements, if any
+  if NumEmpty > 0 then
+    SetLength(PathElements, Length(PathElements) - NumEmpty);
+end;
+
+function GetPathString(const PathType: TPathType; out PathString: string): LSTATUS;
+var
+  RootKey: HKEY;
+  SubKeyName: string;
+begin
+  if PathType = PathTypeSystem then
+  begin
+    RootKey := HKEY_LOCAL_MACHINE;
+    SubKeyName := WINDOWS_PATH_MACHINE_REGISTRY_SUBKEY;
+  end
+  else
+  begin
+    RootKey := HKEY_CURRENT_USER;
+    SubKeyName := WINDOWS_PATH_USER_REGISTRY_SUBKEY;
+  end;
+  result := RegGetStringValue('', RootKey, SubKeyName,
+    WINDOWS_PATH_REGISTRY_VALUE, PathString);
+end;
+
+function SetPathString(const PathType: TPathType; const PathString: string): LSTATUS;
+var
+  RootKey: HKEY;
+  SubKeyName: string;
+begin
+  if PathType = PathTypeSystem then
+  begin
+    RootKey := HKEY_LOCAL_MACHINE;
+    SubKeyName := WINDOWS_PATH_MACHINE_REGISTRY_SUBKEY;
+  end
+  else
+  begin
+    RootKey := HKEY_CURRENT_USER;
+    SubKeyName := WINDOWS_PATH_USER_REGISTRY_SUBKEY;
+  end;
+  result := RegSetExpandStringValue('', RootKey, SubKeyName, WINDOWS_PATH_REGISTRY_VALUE, PathString);
+end;
+
+function GetPath(const PathType: TPathType; const Expand: Boolean;
+  out Path: string): LSTATUS;
+var
+  PathString: string;
+  PathElements: TStringArray;
+  I: Integer;
+begin
+  result := GetPathString(PathType, PathString);
+  if result <> ERROR_SUCCESS then
+    exit;
+  if Expand then
+    PathString := ExpandEnvStrings(PathString);
+  GetPathElements(PathString, PathElements);
+  if Length(PathElements) = 0 then
+    exit;
+  Path := PathElements[0];
+  for I := 1 to Length(PathElements) - 1 do
+    Path := Path + sLineBreak + PathElements[I];
+end;
+
+function IsPathElementValid(const Path: string): Boolean;
+var
+  I: Integer;
+begin
+  result := Path <> '';
+  if not result then
+    exit;
+  // See https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file
+  // ':' and '\' not included since they can be in a path element
+  for I := 1 to Length(Path) do
+  begin
+    case Path[I] of
+      #0..#31, '<', '>', '"', '/', '|', '?', '*':
+      begin
+        result := false;
+        break;
+      end;
+    end;
+  end;
+  if not result then
+    exit;
+  case Path[Length(Path)] of
+    #9, ' ', '.':
+    begin
+      result := false;
+    end;
+  end;
+end;
+
+function CountSubstring(const Substring, S: string): Integer;
+var
+  P: Integer;
+begin
+  result := 0;
+  P := Pos(Substring, S, 1);
+  while P <> 0 do
+  begin
+    Inc(result);
+    P := Pos(Substring, S, P + Length(Substring));
+  end;
+end;
+
+procedure StrSplit(S, Delim: string; var Dest: TStringArray);
+var
+  I, P: Integer;
+begin
+  I := CountSubstring(Delim, S);
+  // If no delimiters, then Dest is a single-element array
+  if I = 0 then
+  begin
+    SetLength(Dest, 1);
+    Dest[0] := S;
+    exit;
+  end;
+  SetLength(Dest, I + 1);
+  for I := 0 to Length(Dest) - 1 do
+  begin
+    P := Pos(Delim, S);
+    if P > 0 then
+    begin
+      Dest[I] := Copy(S, 1, P - 1);
+      Delete(S, 1, P + Length(Delim) - 1);
+    end
+    else
+      Dest[I] := S;
+  end;
+end;
+
+function StandardizePathElement(PathElement: string): string;
+var
+  I: Integer;
+  Parts: TStringArray;
+  Prefix, ExpandedPathElement: string;
+begin
+  // Remove quotes
+  I := Pos('"', PathElement);
+  while I > 0 do
+    Delete(PathElement, I, 1);
+  result := PathElement;
+  StrSplit(PathElement, '\', Parts);
+  // No delimiters
+  if Length(Parts) < 2 then
+    exit;
+  // Preserve leading '\\' or '\'
+  if Pos('\\', PathElement) = 1 then
+    Prefix := '\\'
+  else if PathElement[1] = '\' then
+    Prefix := '\'
+  else
+    Prefix := '';
+  PathElement := Parts[0];
+  for I := 1 to Length(Parts) - 1 do
+  begin
+    if Parts[I] <> '' then
+      PathElement := PathElement + '\' + Parts[I];
+  end;
+  ExpandedPathElement := ExpandEnvStrings(PathElement);
+  // If expanded path element is drive letter and ':' only, add trailing '\'
+  if (Length(ExpandedPathElement) = 2) and (ExpandedPathElement[2] = ':') then
+    PathElement := PathElement + '\';
+  result := Prefix + PathElement;
+end;
+
+function SameText(const S1, S2: string): Boolean;
+const
+  CSTR_EQUAL = 2;
+begin
+  result := CompareStringW(GetThreadLocale(),  // LCID    Local
+    LINGUISTIC_IGNORECASE,                     // DWORD   dwCmpFlags
+    PChar(S1),                                 // PCNZWCH lpString1
+    -1,                                        // int     cchCount1
+    PChar(S2),                                 // PCNZWCH lpString2
+    -1) = CSTR_EQUAL;                          // int     cchCount2
+end;
+
+function IsDirInPath(DirName: string; const PathType: TPathType;
+  out FindType: TPathFindType): LSTATUS;
+var
+  PathString: string;
+  PathElements: TStringArray;
+  I: Integer;
+begin
+  FindType := PathFindTypeNotFound;
+  if not IsPathElementValid(DirName) then
+  begin
+    result := ERROR_INVALID_PARAMETER;
+    exit;
+  end;
+  result := GetPathString(PathType, PathString);
+  if result <> ERROR_SUCCESS then
+    exit;
+  GetPathElements(PathString, PathElements);
+  if Length(PathElements) = 0 then
+  begin
+    result := ERROR_PATH_NOT_FOUND;
+    exit;
+  end;
+  DirName := StandardizePathElement(DirName);
+  for I := 0 to Length(PathElements) - 1 do
+  begin
+    if SameText(DirName, StandardizePathElement(PathElements[I])) then
+    begin
+      FindType := PathFindTypeUnexpanded;
+      exit;
+    end;
+  end;
+  // Not found yet; try expanding environment strings
+  DirName := ExpandEnvStrings(DirName);
+  PathString := ExpandEnvStrings(PathString);
+  GetPathElements(PathString, PathElements);
+  for I := 0 to Length(PathElements) - 1 do
+  begin
+    if SameText(DirName, StandardizePathElement(PathElements[I])) then
+    begin
+      FindType := PathFindTypeExpanded;
+      exit;
+    end;
+  end;
+  result := ERROR_PATH_NOT_FOUND;
+end;
+
+function AddDirToPath(DirName: string; const PathType: TPathType;
+  const PathAddType: TPathAddType): LSTATUS;
+var
+  FindType: TPathFindType;
+  PathString: string;
+begin
+  result := IsDirInPath(DirName, PathType, FindType);
+  if result = ERROR_SUCCESS then
+  begin
+    result := ERROR_ALREADY_EXISTS;
+    exit;
+  end;
+  if not ((result = ERROR_FILE_NOT_FOUND) or (result = ERROR_PATH_NOT_FOUND)) then
+    exit;
+  result := GetPathString(PathType, PathString);
+  if not ((result = ERROR_SUCCESS) or (result = ERROR_FILE_NOT_FOUND)) then
+    exit;
+  DirName := StandardizePathElement(DirName);
+  // Must add quotes when adding path element containing delimiter
+  if Pos(WINDOWS_PATH_DELIMITER, DirName) > 0 then
+    DirName := '"' + DirName + '"';
+  if (result = ERROR_FILE_NOT_FOUND) or (PathString = '') then
+    PathString := DirName
+  else
+  begin
+    if PathAddType = PathAddTypeEnd then
+    begin
+      if PathString[Length(PathString)] <> WINDOWS_PATH_DELIMITER then
+        PathString := PathString + WINDOWS_PATH_DELIMITER + DirName
+      else
+        PathString := PathString + DirName;
+    end
+    else  // Add to beginning
+    begin
+      if PathString[1] <> WINDOWS_PATH_DELIMITER then
+        PathString := DirName + WINDOWS_PATH_DELIMITER + PathString
+      else
+        PathString := DirName + PathString;
+    end;
+  end;
+  result := SetPathString(PathType, PathString);
+end;
+
+function CountPathElements(DirName: string; var PathElements: TStringArray): Integer;
+var
+  I: Integer;
+begin
+  result := 0;
+  if Length(PathElements) > 0 then
+  begin
+    DirName := StandardizePathElement(DirName);
+    for I := 0 to Length(PathElements) - 1 do
+      if SameText(DirName, StandardizePathElement(PathElements[I])) then
+        Inc(result);
+  end;
+end;
+
+function RemoveDirFromPath(DirName: string; const PathType: TPathType): LSTATUS;
+var
+  FindType: TPathFindType;
+  PathString: string;
+  PathElementsIn, PathElementsOut: TStringArray;
+  I, J: Integer;
+begin
+  result := IsDirInPath(DirName, PathType, FindType);
+  if result <> ERROR_SUCCESS then
+    exit;
+  // Only check unexpanded path
+  if FindType <> PathFindTypeUnexpanded then
+  begin
+    result := ERROR_PATH_NOT_FOUND;
+    exit;
+  end;
+  result := GetPathString(PathType, PathString);
+  if result <> ERROR_SUCCESS then
+    exit;
+  if PathString = '' then
+  begin
+    result := ERROR_PATH_NOT_FOUND;
+    exit;
+  end;
+  GetPathElements(PathString, PathElementsIn);
+  PathString := '';  // Value to set in registry
+  if Length(PathElementsIn) > 1 then
+  begin
+    DirName := StandardizePathElement(DirName);
+    // Output array length is length of original array less the number
+    // of times DirName appears in input array
+    SetLength(PathElementsOut, Length(PathElementsIn) - CountPathElements(DirName, PathElementsIn));
+    I := 0;
+    for J := 0 to Length(PathElementsIn) - 1 do
+    begin
+      if not SameText(DirName, StandardizePathElement(PathElementsIn[J])) then
+      begin
+        // Must add quotes when adding path element containing delimiter
+        if Pos(WINDOWS_PATH_DELIMITER, PathElementsIn[J]) > 0 then
+          PathElementsOut[I] := '"' + PathElementsIn[J] + '"'
+        else
+          PathElementsOut[I] := PathElementsIn[J];
+        Inc(I);
+      end;
+    end;
+    // If Length(PathElementsOut) = 0, PathString stays empty
+    if Length(PathElementsOut) > 0 then
+    begin
+      PathString := PathElementsOut[0];
+      for I := 1 to Length(PathElementsOut) - 1 do
+        PathString := PathString + WINDOWS_PATH_DELIMITER + PathElementsOut[I];
+    end;
+  end;
+  result := SetPathString(PathType, PathString);
+end;
+
+begin
+end.
diff --git a/history.md b/history.md
index 9cfc3e4..97a59fe 100644
--- a/history.md
+++ b/history.md
@@ -1,4 +1,16 @@
-# PathMgr.dll Version History
+# PathMgr/PathMan Version History
+
+## 2.0.0 (18 Mar 2024)
+
+* Added support for directory names containing the `;` character. Such directories are enclosed in quotes (`"`) in the Path string.
+
+* Updated all character and string processing code to use Unicode only.
+
+* Fix: If adding an environment variable as a directory name and it expands to a drive letter and path only (e.g., `%SystemDrive%`), add trailing `\`).
+
+* Redesigned EditPath utility, renamed it to PathMan, and set at version 2.0.0.0 to match the PathMgr.dll file.
+
+* Corrected file type in PathMgr.dll resource.
 
 ## 1.0.4 (18 Jan 2023)
 
@@ -28,7 +40,7 @@
 
 ## 1.0.1 (29 Jan 2021)
 
-* Fix: Validate `PathType` parameter for `IsDirInPath()` function.
+* Fix: Validate `PathType` parameter for `IsDirInPath` function.
 
 * Fix: Corrected version check for Inno Setup sample script (thanks to Martijn Laan).
 
diff --git a/wsPathMgr.pp b/wsPathMgr.pp
deleted file mode 100644
index 4dc82aa..0000000
--- a/wsPathMgr.pp
+++ /dev/null
@@ -1,252 +0,0 @@
-{ Copyright (C) 2021 by Bill Stewart (bstewart at iname.com)
-
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the Free
-  Software Foundation; either version 3 of the License, or (at your option) any
-  later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
-  details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program. If not, see https://www.gnu.org/licenses/.
-
-}
-
-{$MODE OBJFPC}
-{$H+}
-
-unit wsPathMgr;
-
-interface
-
-type
-  TPathType     = (SystemPath, UserPath);
-  TPathAddType  = (AppendDirToPath, AppendPathToDir);
-  TPathFindType = (NotFound, FoundInUnexpandedPath, FoundInExpandedPath);
-
-// Gets the system or user Path, expanding if requested, to the specified
-// newline-delimited result string; returns 0 for success or non-zero for
-// failure
-function wsGetPath(const PathType: TPathType; const Expand: Boolean; var ResultStr: UnicodeString): DWORD;
-
-// For all following functions: If the directory name is empty or contains one
-// or more invalid characters, return value will be ERROR_INVALID_PARAMETER
-
-// Checks if a directory exists in the system or user Path; typical return
-// values:
-// * ERROR_SUCCESS - directory was found in Path
-// * ERROR_FILE_NOT_FOUND - Path registry value not found
-// * ERROR_PATH_NOT_FOUND - directory was not found in Path
-// Other exit codes indicate an error
-function wsIsDirInPath(DirName: UnicodeString; const PathType: TPathType; var PathFindType: TPathFindType): DWORD;
-
-// Adds a directory to the end or beginning of the system or user Path; if the
-// directory already exists in the unexpanded or expanded Path, returns
-// ERROR_SUCCESS for success, or ERROR_ALREADY_EXISTS if the directory already
-// exists in the unexpanded or expanded Path; other exit codes indicate an
-// error
-function wsAddDirToPath(DirName: UnicodeString; const PathType: TPathType; const PathAddType: TPathAddType): DWORD;
-
-// Removes the specified directory from the system or user Path; returns
-// ERROR_SUCCESS for success, or ERROR_PATH_NOT_FOUND if the directory does not
-// exit in the unexpanded Path; other exit codes indicate an error
-function wsRemoveDirFromPath(DirName: UnicodeString; const PathType: TPathType): DWORD;
-
-implementation
-
-uses
-  Windows,
-  wsUtilArch,
-  wsUtilEnv,
-  wsUtilReg,
-  wsUtilStr;
-
-const
-  REG_VALUE_NAME = 'Path';
-
-// Initializes RegRoot and SubKeyName based on PathType
-procedure InitRegKeyAndPath(const PathType: TPathType; var RegRoot: HKEY; var SubKeyName: UnicodeString);
-begin
-  if PathType = SystemPath then
-  begin
-    if IsWin64() then
-      RegRoot := HKEY_LOCAL_MACHINE_64
-    else
-      RegRoot := HKEY_LOCAL_MACHINE;
-    SubKeyName := 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment';
-  end
-  else
-  begin
-    if IsWin64() then
-      RegRoot := HKEY_CURRENT_USER_64
-    else
-      RegRoot := HKEY_CURRENT_USER;
-    SubKeyName := 'Environment';
-  end;
-end;
-
-function wsGetPath(const PathType: TPathType; const Expand: Boolean; var ResultStr: UnicodeString): DWORD;
-const
-  NEWLINE: UnicodeString = #13 + #10;
-var
-  RegRoot: HKEY;
-  SubKeyName, Path: UnicodeString;
-  Dirs: TArrayOfString;
-  I: LongInt;
-begin
-  InitRegKeyAndPath(PathType, RegRoot, SubKeyName);
-  result := RegQueryStringValue(RegRoot, SubKeyName, REG_VALUE_NAME, Path);
-  if result <> ERROR_SUCCESS then
-    exit();
-  if Expand then
-    Path := ExpandEnvStrings(Path);
-  ResultStr := '';
-  StrSplit(Path, ';', Dirs);
-  for I := 0 to Length(Dirs) - 1 do
-    if StrHasNonWhitespace(Dirs[I]) then
-      JoinString(ResultStr, NormalizePath(Dirs[I]), NEWLINE);
-end;
-
-function wsIsDirInPath(DirName: UnicodeString; const PathType: TPathType; var PathFindType: TPathFindType): DWORD;
-var
-  RegRoot: HKEY;
-  SubKeyName, Path: UnicodeString;
-  Dirs: TArrayOfString;
-  I: LongInt;
-begin
-  if not IsValidPath(DirName) then
-    exit(ERROR_INVALID_PARAMETER);
-  InitRegKeyAndPath(PathType, RegRoot, SubKeyName);
-  result := RegQueryStringValue(RegRoot, SubKeyName, REG_VALUE_NAME, Path);
-  if result <> ERROR_SUCCESS then
-    exit();
-  // Normalize directory name
-  DirName := NormalizePath(DirName);
-  // Search without expanding environment variable references
-  StrSplit(Path, ';', Dirs);
-  for I := 0 to Length(Dirs) - 1 do
-    if SameText(DirName, NormalizePath(Dirs[I])) then
-    begin
-      PathFindType := FoundInUnexpandedPath;
-      exit(ERROR_SUCCESS);
-    end;
-  // Not found yet; expand environment variable references and try again
-  DirName := ExpandEnvStrings(DirName);
-  Path := ExpandEnvStrings(Path);
-  StrSplit(Path, ';', Dirs);
-  for I := 0 to Length(Dirs) - 1 do
-    if SameText(DirName, NormalizePath(Dirs[I])) then
-    begin
-      PathFindType := FoundInExpandedPath;
-      exit(ERROR_SUCCESS);
-    end;
-  PathFindType := NotFound;
-  exit(ERROR_PATH_NOT_FOUND);
-end;
-
-function wsAddDirToPath(DirName: UnicodeString; const PathType: TPathType; const PathAddType: TPathAddType): DWORD;
-var
-  PathFindType: TPathFindType;
-  RegRoot: HKEY;
-  SubKeyName, Path: UnicodeString;
-begin
-  if not IsValidPath(DirName) then
-    exit(ERROR_INVALID_PARAMETER);
-  result := wsIsDirInPath(DirName, PathType, PathFindType);
-  if result = ERROR_SUCCESS then
-    exit(ERROR_ALREADY_EXISTS);
-  if not ((result = ERROR_FILE_NOT_FOUND) or (result = ERROR_PATH_NOT_FOUND)) then
-    exit();
-  InitRegKeyAndPath(PathType, RegRoot, SubKeyName);
-  result := RegQueryStringValue(RegRoot, SubKeyName, REG_VALUE_NAME, Path);
-  if (result = ERROR_SUCCESS) or (result = ERROR_FILE_NOT_FOUND) then
-  begin
-    DirName := NormalizePath(DirName);
-    if result = ERROR_FILE_NOT_FOUND then
-      Path := DirName
-    else
-    begin
-      if PathAddType = AppendDirToPath then
-      begin
-        if (Path <> '') and (Path[Length(Path)] <> ';') then
-          Path := Path + ';';
-        Path := Path + DirName;
-      end
-      else if PathAddType = AppendPathToDir then
-      begin
-        if (Path <> '') and (Path[1] <> ';') then
-          Path := ';' + Path;
-        Path := DirName + Path;
-      end;
-    end;
-    result := RegWriteExpandStringValue(RegRoot, SubKeyName, REG_VALUE_NAME, Path);
-  end;
-end;
-
-// Counts the number of times a directory name appears in an array of directory
-// names
-function CountDirInDirs(DirName: UnicodeString; var Dirs: TArrayOfString): DWORD;
-var
-  I: LongInt;
-begin
-  result := 0;
-  if Length(Dirs) > 0 then
-  begin
-    DirName := NormalizePath(DirName);
-    for I := 0 to Length(Dirs) - 1 do
-      if SameText(DirName, NormalizePath(Dirs[I])) then
-        Inc(result);
-  end;
-end;
-
-function wsRemoveDirFromPath(DirName: UnicodeString; const PathType: TPathType): DWORD;
-var
-  PathFindType: TPathFindType;
-  RegRoot: HKEY;
-  SubKeyName, Path: UnicodeString;
-  InDirs, OutDirs: TArrayOfString;
-  J, I: LongInt;
-begin
-  if not IsValidPath(DirName) then
-    exit(ERROR_INVALID_PARAMETER);
-  result := wsIsDirInPath(DirName, PathType, PathFindType);
-  if result <> ERROR_SUCCESS then
-    exit();
-  // Only look in unexpanded path
-  if PathFindType <> FoundInUnexpandedPath then
-    exit(ERROR_PATH_NOT_FOUND);
-  InitRegKeyAndPath(PathType, RegRoot, SubKeyName);
-  result := RegQueryStringValue(RegRoot, SubKeyName, REG_VALUE_NAME, Path);
-  if result <> ERROR_SUCCESS then
-    exit();
-  if Length(Path) = 0 then
-    exit(ERROR_PATH_NOT_FOUND);
-  StrSplit(Path, ';', InDirs);
-  Path := '';  // reuse this to write new registry value
-  if Length(InDirs) > 1 then
-  begin
-    DirName := NormalizePath(DirName);
-    // Output array length is length of original array less the number
-    // of times DirName appears in input array
-    SetLength(OutDirs, Length(InDirs) - CountDirInDirs(DirName, InDirs));
-    J := 0;
-    for I := 0 to Length(InDirs) - 1 do
-    begin
-      if not SameText(DirName, NormalizePath(InDirs[I])) then
-      begin
-        OutDirs[J] := InDirs[I];
-        Inc(J);
-      end;
-    end;
-    // Build new Path string using output array
-    for I := 0 to Length(OutDirs) - 1 do
-      JoinString(Path, OutDirs[I], ';');
-  end;
-  result := RegWriteExpandStringValue(RegRoot, SubKeyName, REG_VALUE_NAME, Path);
-end;
-
-begin
-end.
diff --git a/wsUtilArch.pp b/wsUtilArch.pp
deleted file mode 100644
index ed62c37..0000000
--- a/wsUtilArch.pp
+++ /dev/null
@@ -1,104 +0,0 @@
-{ Copyright (C) 2021 by Bill Stewart (bstewart at iname.com)
-
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the Free
-  Software Foundation; either version 3 of the License, or (at your option) any
-  later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
-  details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program. If not, see https://www.gnu.org/licenses/.
-
-}
-
-{$MODE OBJFPC}
-{$H+}
-
-unit wsUtilArch;
-
-interface
-
-uses
-  Windows;
-
-// Returns true if the current OS is 64-bit or false otherwise
-function IsWin64(): Boolean;
-
-// Returns true if the current process is WoW64 (i.e., 32-bit running on a
-// 64-bit OS), or false otherwise
-function IsProcessWoW64(): Boolean;
-
-implementation
-
-function IsProcessor64Bit(): Boolean;
-const
-  PROCESSOR_ARCHITECTURE_INTEL   = 0;
-  PROCESSOR_ARCHITECTURE_ARM     = 5;
-  PROCESSOR_ARCHITECTURE_IA64    = 6;
-  PROCESSOR_ARCHITECTURE_AMD64   = 9;
-  PROCESSOR_ARCHITECTURE_ARM64   = 12;
-  PROCESSOR_ARCHITECTURE_UNKNOWN = $FFFF;
-type
-  TGetNativeSystemInfo = procedure(var lpSystemInfo: SYSTEM_INFO); stdcall;
-var
-  Kernel32: HMODULE;
-  GetNativeSystemInfo: TGetNativeSystemInfo;
-  SystemInfo: SYSTEM_INFO;
-begin
-  result := false;
-  Kernel32 := GetModuleHandle('kernel32');  // LPCSTR lpModuleName
-  GetNativeSystemInfo := TGetNativeSystemInfo(GetProcAddress(Kernel32, 'GetNativeSystemInfo'));
-  if Assigned(GetNativeSystemInfo) then
-  begin
-    GetNativeSystemInfo(SystemInfo);  // LPSYSTEM_INFO lpSystemInfo
-    with SystemInfo do
-      result := (wProcessorArchitecture = PROCESSOR_ARCHITECTURE_IA64) or
-        (wProcessorArchitecture = PROCESSOR_ARCHITECTURE_AMD64) or
-        (wProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM64);
-  end;
-end;
-
-function IsProcessWoW64(): Boolean;
-type
-  TIsWow64Process = function(hProcess: HANDLE; var Wow64Process: BOOL): BOOL; stdcall;
-var
-  Kernel32: HMODULE;
-  IsWow64Process: TIsWow64Process;
-  ProcessHandle: HANDLE;
-  IsWoW64: BOOL;
-begin
-  result := false;
-  Kernel32 := GetModuleHandle('kernel32');  // LPCSTR lpModuleName
-  IsWow64Process := TIsWow64Process(GetProcAddress(Kernel32, 'IsWow64Process'));
-  if Assigned(IsWow64Process) then
-  begin
-    ProcessHandle := OpenProcess(PROCESS_QUERY_INFORMATION,  // DWORD dwDesiredAccess
-      true,                                                  // BOOL  bInheritHandle
-      GetCurrentProcessId());                                // DWORD dwProcessId
-    if ProcessHandle <> 0 then
-    begin
-      if IsWow64Process(ProcessHandle,  // HANDLE hProcess
-        IsWoW64) then                   // PBOOL  Wow64Process
-        result := IsWoW64;
-      CloseHandle(ProcessHandle);  // HANDLE hObject
-    end;
-  end;
-end;
-
-function IsWin64(): Boolean;
-begin
-{$IFDEF WIN64}
-  // compiled on x64
-  result := true;
-{$ELSE}
-  // true if processor is 64-bit and current process is WoW64
-  result := IsProcessor64Bit() and IsProcessWoW64();
-{$ENDIF}
-end;
-
-begin
-end.
diff --git a/wsUtilEnv.pp b/wsUtilEnv.pp
deleted file mode 100644
index 120ca5d..0000000
--- a/wsUtilEnv.pp
+++ /dev/null
@@ -1,83 +0,0 @@
-{ Copyright (C) 2021 by Bill Stewart (bstewart at iname.com)
-
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the Free
-  Software Foundation; either version 3 of the License, or (at your option) any
-  later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
-  details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program. If not, see https://www.gnu.org/licenses/.
-
-}
-
-{$MODE OBJFPC}
-{$H+}
-
-unit wsUtilEnv;
-
-interface
-
-// Expands environment variable references (e.g., %varname%) in the named
-// string and returns the resulting string with expanded references
-function ExpandEnvStrings(const Name: UnicodeString): UnicodeString;
-
-// Gets the value of the named environment variable; returns an empty string
-// if the variable doesn't exist
-function GetEnvVar(const Name: UnicodeString): UnicodeString;
-
-implementation
-
-uses
-  Windows;
-
-function ExpandEnvStrings(const Name: UnicodeString): UnicodeString;
-var
-  NumChars, BufSize: DWORD;
-  pBuffer: PWideChar;
-begin
-  result := '';
-  // Get number of characters needed for buffer
-  NumChars := ExpandEnvironmentStringsW(PWideChar(Name),  // LPCWSTR lpSrc
-    nil,                                                  // LPWSTR  lpDst
-    0);                                                   // DWORD   nSize
-  if NumChars > 0 then
-  begin
-    BufSize := NumChars * SizeOf(WideChar);
-    GetMem(pBuffer, BufSize);
-    if ExpandEnvironmentStringsW(PWideChar(Name),  // LPCWSTR lpSrc
-      pBuffer,                                     // LPWSTR  lpDst
-      NumChars) > 0 then                           // DWORD   nSize
-      result := pBuffer;
-    FreeMem(pBuffer, BufSize);
-  end;
-end;
-
-function GetEnvVar(const Name: UnicodeString): UnicodeString;
-var
-  NumChars, BufSize: DWORD;
-  pBuffer: PWideChar;
-begin
-  result := '';
-  // Get number of characters needed for buffer
-  NumChars := GetEnvironmentVariableW(PWideChar(Name),  // LPCWSTR lpName
-    nil,                                                // LPWSTR  lpBuffer
-    0);                                                 // DWORD   nSize
-  if NumChars > 0 then
-  begin
-    BufSize := NumChars * SizeOf(WideChar);
-    GetMem(pBuffer, BufSize);
-    if GetEnvironmentVariableW(PWideChar(Name),  // LPCWSTR lpName
-      pBuffer,                                   // LPWSTR  lpBuffer
-      NumChars) > 0 then                         // DWORD   nSize
-      result := pBuffer;
-    FreeMem(pBuffer, BufSize);
-  end;
-end;
-
-begin
-end.
diff --git a/wsUtilMsg.pp b/wsUtilMsg.pp
deleted file mode 100644
index 77d0c7f..0000000
--- a/wsUtilMsg.pp
+++ /dev/null
@@ -1,200 +0,0 @@
-{ Copyright (C) 2021 by Bill Stewart (bstewart at iname.com)
-
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the Free
-  Software Foundation; either version 3 of the License, or (at your option) any
-  later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
-  details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program. If not, see https://www.gnu.org/licenses/.
-
-}
-
-{$MODE OBJFPC}
-{$H+}
-
-unit wsUtilMsg;
-
-interface
-
-uses
-  Windows;
-
-// For the specified string, replaces '%1' ('%2', etc.) in the string with the
-// values from the Args array; if the Args array contains an insufficient
-// number of elements, the message string is returned unmodified
-function FormatMessageInsertArgs(const Msg: UnicodeString; const Args: array of UnicodeString): UnicodeString;
-
-// For the following functions, the parameters are as follows:
-//
-// MessageId - the Windows message number [e.g., from GetLastError() function]
-//
-// AddId - if true, appends the error number (in decimal) to the end of the
-// returned message
-//
-// Module - If specified, names a module that the FormatMessage() function
-// should search for messages
-//
-// Args - If specified, provides an array of arguments that will be used to
-// replace the '%1' ('%2', etc.) placeholders in the message string; if the
-// Args array contains an insufficient number of elements, the message string
-// is returned unmodified
-
-function GetWindowsMessage(const MessageId: DWORD): UnicodeString;
-
-function GetWindowsMessage(const MessageId: DWORD; const AddId: Boolean): UnicodeString;
-
-function GetWindowsMessage(const MessageId: DWORD; const Module: UnicodeString): UnicodeString;
-
-function GetWindowsMessage(const MessageId: DWORD; const Module: UnicodeString; const AddId: Boolean): UnicodeString;
-
-function GetWindowsMessage(const MessageId: DWORD; const Args: array of UnicodeString): UnicodeString;
-
-function GetWindowsMessage(const MessageId: DWORD; const AddId: Boolean; const Args: array of UnicodeString): UnicodeString;
-
-function GetWindowsMessage(const MessageId: DWORD; const Module: UnicodeString;
-  const Args: array of UnicodeString): UnicodeString;
-
-function GetWindowsMessage(const MessageId: DWORD; const Module: UnicodeString; const AddId: Boolean;
-  const Args: array of UnicodeString): UnicodeString;
-
-implementation
-
-function FormatMessageFromSystem(const MessageId: DWORD; const AddId: Boolean = false;
-  const Module: UnicodeString = ''): UnicodeString;
-var
-  MsgFlags: DWORD;
-  ModuleHandle: HMODULE;
-  pBuffer: PWideChar;
-  StrID: UnicodeString;
-begin
-  MsgFlags := FORMAT_MESSAGE_MAX_WIDTH_MASK or
-    FORMAT_MESSAGE_ALLOCATE_BUFFER or
-    FORMAT_MESSAGE_FROM_SYSTEM or
-    FORMAT_MESSAGE_IGNORE_INSERTS;
-  ModuleHandle := 0;
-  if Module <> '' then
-  begin
-    ModuleHandle := LoadLibraryExW(PWideChar(Module),  // LPCWSTR lpLibFileName
-      0,                                               // HANDLE hFile
-      LOAD_LIBRARY_AS_DATAFILE);                       // DWORD  dwFlags
-    if ModuleHandle <> 0 then
-      MsgFlags := MsgFlags or FORMAT_MESSAGE_FROM_HMODULE;
-  end;
-  if FormatMessageW(MsgFlags,                   // DWORD   dwFlags
-    Pointer(ModuleHandle),                      // LPCVOID lpSource
-    MessageId,                                  // DWORD   dwMessageId
-    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),  // DWORD   dwLanguageId
-    @pBuffer,                                   // LPWSTR  lpBuffer
-    0,                                          // DWORD   nSize
-    nil) > 0 then                               // va_list Arguments
-  begin
-    result := PWideChar(pBuffer);
-    LocalFree(HLOCAL(pBuffer));  // HLOCAL hMem
-    if result[Length(result)] = ' ' then
-      SetLength(result, Length(result) - 1);
-  end
-  else
-    result := 'Unknown error';
-  if ModuleHandle <> 0 then
-    FreeLibrary(ModuleHandle);  // HMODULE hLibModule
-  if AddId then
-  begin
-    Str(MessageId, StrID);
-    result := result + ' (' + StrID + ')';
-  end;
-end;
-
-function FormatMessageInsertArgs(const Msg: UnicodeString; const Args: array of UnicodeString): UnicodeString;
-var
-  ArgArray: array of DWORD_PTR;
-  I, MsgFlags: DWORD;
-  pBuffer: PWideChar;
-begin
-  result := Msg;
-  if High(Args) > -1 then
-  begin
-    SetLength(ArgArray, High(Args) + 1);
-    for I := Low(Args) to High(Args) do
-      ArgArray[I] := DWORD_PTR(PWideChar(Args[I]));
-    MsgFlags := FORMAT_MESSAGE_ALLOCATE_BUFFER or
-      FORMAT_MESSAGE_FROM_STRING or
-      FORMAT_MESSAGE_ARGUMENT_ARRAY;
-    try
-      if FormatMessageW(MsgFlags,  // DWORD   dwFlags
-        PWideChar(Msg),            // LPCVOID lpSource
-        0,                         // DWORD   dwMessageId
-        0,                         // DWORD   dwLanguageId
-        @pBuffer,                  // LWTSTR  lpBuffer
-        0,                         // DWORD   nSize
-        @ArgArray[0]) > 0 then     // va_list Arguments
-      begin
-        result := PWideChar(pBuffer);
-        LocalFree(HLOCAL(pBuffer));   // HLOCAL hMem
-      end;
-    except
-    end; //try
-  end;
-end;
-
-function GetWindowsMessage(const MessageId: DWORD): UnicodeString;
-begin
-  result := FormatMessageFromSystem(MessageId);
-end;
-
-function GetWindowsMessage(const MessageId: DWORD; const AddId: Boolean): UnicodeString;
-begin
-  result := FormatMessageFromSystem(MessageId, AddId);
-end;
-
-function GetWindowsMessage(const MessageId: DWORD; const Module: UnicodeString): UnicodeString;
-begin
-  result := FormatMessageFromSystem(MessageId, false, Module);
-end;
-
-function GetWindowsMessage(const MessageId: DWORD; const Module: UnicodeString; const AddId: Boolean): UnicodeString;
-begin
-  result := FormatMessageFromSystem(MessageId, AddId, Module);
-end;
-
-function GetWindowsMessage(const MessageId: DWORD; const Args: array of UnicodeString): UnicodeString;
-var
-  Msg: UnicodeString;
-begin
-  Msg := FormatMessageFromSystem(MessageId);
-  result := FormatMessageInsertArgs(Msg, Args);
-end;
-
-function GetWindowsMessage(const MessageId: DWORD; const AddId: Boolean; const Args: array of UnicodeString): UnicodeString;
-var
-  Msg: UnicodeString;
-begin
-  Msg := FormatMessageFromSystem(MessageId, AddId);
-  result := FormatMessageInsertArgs(Msg, Args);
-end;
-
-function GetWindowsMessage(const MessageId: DWORD; const Module: UnicodeString;
-  const Args: array of UnicodeString): UnicodeString;
-var
-  Msg: UnicodeString;
-begin
-  Msg := FormatMessageFromSystem(MessageId, false, Module);
-  result := FormatMessageInsertArgs(Msg, Args);
-end;
-
-function GetWindowsMessage(const MessageId: DWORD; const Module: UnicodeString; const AddId: Boolean;
-  const Args: array of UnicodeString): UnicodeString;
-var
-  Msg: UnicodeString;
-begin
-  Msg := FormatMessageFromSystem(MessageId, AddId, Module);
-  result := FormatMessageInsertArgs(Msg, Args);
-end;
-
-begin
-end.
diff --git a/wsUtilReg.pp b/wsUtilReg.pp
deleted file mode 100644
index 7da1021..0000000
--- a/wsUtilReg.pp
+++ /dev/null
@@ -1,164 +0,0 @@
-{ Copyright (C) 2021 by Bill Stewart (bstewart at iname.com)
-
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the Free
-  Software Foundation; either version 3 of the License, or (at your option) any
-  later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
-  details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program. If not, see https://www.gnu.org/licenses/.
-
-}
-
-{$MODE OBJFPC}
-{$H+}
-
-unit wsUtilReg;
-
-interface
-
-uses
-  Windows;
-
-const
-  HKEY_CURRENT_USER_64  = $80000101;
-  HKEY_CURRENT_USER_32  = $80000201;
-  HKEY_LOCAL_MACHINE_64 = $80000102;
-  HKEY_LOCAL_MACHINE_32 = $80000202;
-
-// Returns the ValueName value from the specified key and subkey into
-// ResultStr; returns 0 for success or non-zero for failure
-function RegQueryStringValue(RootKey: HKEY; const SubKeyName, ValueName: UnicodeString; var ResultStr: UnicodeString): DWORD;
-
-// Writes the specified REG_EXPAND_SZ-type regsitry value; returns 0 for
-// success or non-zero for failure
-function RegWriteExpandStringValue(RootKey: HKEY; const SubKey, ValueName, Data: UnicodeString): DWORD;
-
-implementation
-
-// Updates RootKey and AccessFlags appropriately if using _32 or _64 RootKey
-procedure InitRegKeyAndFlags(var RootKey: HKEY; var AccessFlags: REGSAM);
-begin
-  if (RootKey and KEY_WOW64_32KEY) <> 0 then
-  begin
-    RootKey := RootKey and (not KEY_WOW64_32KEY);
-    AccessFlags := AccessFlags or KEY_WOW64_32KEY;
-  end
-  else if (RootKey and KEY_WOW64_64KEY) <> 0 then
-  begin
-    RootKey := RootKey and (not KEY_WOW64_64KEY);
-    AccessFlags := AccessFlags or KEY_WOW64_64KEY;
-  end;
-end;
-
-function RegKeyExists(RootKey: HKEY; const SubKeyName: UnicodeString): Boolean;
-var
-  AccessFlags: REGSAM;
-  hkHandle: HANDLE;
-begin
-  AccessFlags := KEY_READ;
-  InitRegKeyAndFlags(RootKey, AccessFlags);
-  result := RegOpenKeyExW(RootKey,  // HKEY    hKey
-    PWideChar(SubKeyName),          // LPCWSTR lpSubKey
-    0,                              // DWORD   ulOptions
-    AccessFlags,                    // REGSAM  samDesired
-    hkHandle) = 0;                  // PHKEY   phkResult
-  if result then
-    RegCloseKey(hkHandle);
-end;
-
-function RegQueryStringValue(RootKey: HKEY; const SubKeyName, ValueName: UnicodeString; var ResultStr: UnicodeString): DWORD;
-var
-  AccessFlags: REGSAM;
-  hkHandle: HKEY;
-  ValueType, ValueSize, BufSize: DWORD;
-  pData, pBuf: Pointer;
-begin
-  AccessFlags := KEY_READ;
-  InitRegKeyAndFlags(RootKey, AccessFlags);
-  result := RegOpenKeyExW(RootKey,  // HKEY    hKey
-    PWideChar(SubKeyName),          // LPCWSTR lpSubKey
-    0,                              // DWORD   ulOptions
-    AccessFlags,                    // REGSAM  samDesired
-    hkHandle);                      // PHKEY   phkResult
-  if result = 0 then
-  begin
-    // First call: Get value size
-    result := RegQueryValueExW(hkHandle,  // HKEY    hKey
-      PWideChar(ValueName),               // LPCWSTR lpValueName
-      nil,                                // LPDWORD lpReserved
-      @ValueType,                         // LPDWORD lpType
-      nil,                                // LPBYTE  lpData
-      @ValueSize);                        // LPDWORD lpcbData
-    if result = 0 then
-    begin
-      // Must be REG_SZ or REG_EXPAND_SZ
-      if (ValueType = REG_SZ) or (ValueType = REG_EXPAND_SZ) then
-      begin
-        GetMem(pData, ValueSize);
-        // Second call: Get value data
-        result := RegQueryValueExW(hkHandle,  // HKEY    hKey
-          PWideChar(ValueName),               // LPCWSTR lpValueName
-          nil,                                // LPDWORD lpReserved
-          @ValueType,                         // LPDWORD lpType
-          pData,                              // LPBYTE  lpData
-          @ValueSize);                        // LPDWORD lpcbData
-        if result = 0 then
-        begin
-          // Last char is null
-          if PWideChar(pData)[(ValueSize div SizeOf(WideChar)) - 1] = #0 then
-            ResultStr := PWideChar(pData)
-          else
-          begin
-            // Last char not null: Return as null-terminated string
-            BufSize := ValueSize + SizeOf(WideChar);
-            GetMem(pBuf, BufSize);
-            FillChar(pBuf^, BufSize, 0);
-            Move(pData^, pBuf^, ValueSize);
-            ResultStr := PWideChar(pBuf);
-            FreeMem(pBuf, BufSize);
-          end;
-        end;
-        FreeMem(pData, ValueSize);
-      end
-      else
-        result := ERROR_INVALID_DATA;
-    end;
-    RegCloseKey(hkHandle);
-  end;
-end;
-
-function RegWriteExpandStringValue(RootKey: HKEY; const SubKey, ValueName, Data: UnicodeString): DWORD;
-var
-  AccessFlags: REGSAM;
-  hkHandle: HKEY;
-  BufSize: DWORD;
-begin
-  AccessFlags := KEY_ALL_ACCESS;
-  InitRegKeyAndFlags(RootKey, AccessFlags);
-  result := RegOpenKeyExW(RootKey,  // HKEY    hKey
-    PWideChar(SubKey),              // LPCWSTR lpSubKey
-    0,                              // DWORD   ulOptions
-    AccessFlags,                    // REGSAM  samDesired
-    hkHandle);                      // PHKEY   phkResult
-  if result = 0 then
-  begin
-    // Account for length of string + terminating null
-    BufSize := (Length(Data) * SizeOf(WideChar)) + SizeOf(WideChar);
-    result := RegSetValueExW(hkHandle,  // HKEY       hKey
-      PWideChar(ValueName),             // LPCWSTR    lpValueName
-      0,                                // DWORD      Reserved
-      REG_EXPAND_SZ,                    // DWORD      dwType
-      PWideChar(Data),                  // const BYTE *lpData
-      BufSize);                         // DWORD      cbData
-    RegCloseKey(hkHandle);
-  end;
-end;
-
-begin
-end.
diff --git a/wsUtilStr.pp b/wsUtilStr.pp
deleted file mode 100644
index 854ea9f..0000000
--- a/wsUtilStr.pp
+++ /dev/null
@@ -1,288 +0,0 @@
-{ Copyright (C) 2021-2023 by Bill Stewart (bstewart at iname.com)
-
-  This program is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the Free
-  Software Foundation; either version 3 of the License, or (at your option) any
-  later version.
-
-  This program is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-  FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
-  details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with this program. If not, see https://www.gnu.org/licenses/.
-
-}
-
-{$MODE OBJFPC}
-{$H+}
-
-unit wsUtilStr;
-
-interface
-
-uses
-  Windows;
-
-type
-  TArrayOfString = array of UnicodeString;
-
-// Returns true if the specified directory name is a valid name to use in
-// the Path
-function IsValidPath(const Path: UnicodeString): Boolean;
-
-// Apppends S to Dest using delimiter
-procedure JoinString(var Dest: UnicodeString; const S, Delim: UnicodeString);
-
-// Normalizes the specified path: Removes redundant '\' in middle and end
-// of path; if the path specifies a drive letter and ':' only, returns the
-// drive letter and ':' with trailing '\'
-function NormalizePath(Path: UnicodeString): UnicodeString;
-
-// Returns true if the two strings are the same; not case-sensitive
-function SameText(const S1, S2: UnicodeString): Boolean;
-
-// Splits S into the Dest array using Delim as a delimiter
-procedure StrSplit(S, Delim: UnicodeString; var Dest: TArrayOfString);
-
-// Returns true if the string contains one or more non-whitespace characters
-function StrHasNonWhitespace(const S: UnicodeString): Boolean;
-
-// Converts the specified string to a number and returns the result; if the
-// conversion fails, returns Def
-function StrToIntDef(const S: UnicodeString; const Def: LongInt): LongInt;
-
-// Converts the specified string to a Unicode string and returns the result
-function StringToUnicodeString(const S: string; const CodePage: UINT): UnicodeString;
-
-implementation
-
-function StrHasNonWhitespace(const S: UnicodeString): Boolean;
-const
-  Whitespace: set of Char = [#9, #32];
-var
-  I: LongInt;
-begin
-  result := false;
-  for I := 1 to Length(S) do
-    if not (S[I] in Whitespace) then
-    begin
-      result := true;
-      break;
-    end;
-end;
-
-// See MSDN topic titled "Naming Files, Paths, and Namespaces" - currently at
-// https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
-// The goal here is to identify whether a directory name we're specifying to
-// add to (or remove from) the Path is valid, so (for example) ';' is not
-// a valid character because Path is ';'-delimited
-function IsValidPath(const Path: UnicodeString): Boolean;
-const
-  InvalidChars: set of Char = [#0..#31, '<', '>', ';', '"', '/', '|', '?', '*'];
-  InvalidEndOfNameChars: set of Char = [#9, #32, '.'];
-var
-  I: LongInt;
-begin
-  result := StrHasNonWhitespace(Path);
-  if result then
-    for I := 1 to Length(Path) do
-    begin
-      result := not (Path[I] in InvalidChars);
-      if not result then
-        break;
-    end;
-  if result then
-    result := not (Path[Length(Path)] in InvalidEndOfNameChars);
-end;
-
-procedure JoinString(var Dest: UnicodeString; const S, Delim: UnicodeString);
-begin
-  if Dest = '' then
-    Dest := S
-  else
-    Dest := Dest + Delim + S;
-end;
-
-function SameText(const S1, S2: UnicodeString): Boolean;
-const
-  CSTR_EQUAL = 2;
-var
-  CompareFlags: LongInt;
-begin
-  CompareFlags := LINGUISTIC_IGNORECASE;
-  result := CompareStringW(GetThreadLocale(),  // LCID    Local
-    CompareFlags,                              // DWORD   dwCmpFlags
-    PWideChar(S1),                             // PCNZWCH lpString1
-    -1,                                        // int     cchCount1
-    PWideChar(S2),                             // PCNZWCH lpString2
-    -1) = CSTR_EQUAL;                          // int     cchCount2
-end;
-
-// Returns the position of SubString within S starting at the specified
-// offset; returns 0 if SubString is not found within S
-function PosEx(const SubString, S: UnicodeString; Offset: LongInt): LongInt;
-var
-  SubLen, MaxLen, I: LongInt;
-  FirstChar: WideChar;
-  pFirstChar: PWideChar;
-begin
-  result := 0;
-  SubLen := Length(SubString);
-  if (SubLen > 0) and (Offset > 0) and (Offset <= Length(S)) then
-  begin
-    MaxLen := Length(S) - SubLen;
-    FirstChar := SubString[1];
-    I := IndexWord(S[Offset], Length(S) - Offset + 1, Word(FirstChar));
-    while (I >= 0) and ((Offset + I - 1) <= MaxLen) do
-    begin
-      pFirstChar := @S[Offset + I];
-      if CompareWord(SubString[1], pFirstChar^, SubLen) = 0 then
-        exit(Offset + I);
-      Offset := Offset + I + 1;
-      I := IndexWord(S[Offset], Length(S) - Offset + 1, Word(FirstChar));
-    end;
-  end;
-end;
-
-// Returns the number of times SubString appears in S
-function CountSubstring(const SubString, S: UnicodeString): LongInt;
-var
-  P: LongInt;
-begin
-  result := 0;
-  P := PosEx(SubString, S, 1);
-  while P <> 0 do
-  begin
-    Inc(result);
-    P := PosEx(SubString, S, P + Length(SubString));
-  end;
-end;
-
-procedure StrSplit(S, Delim: UnicodeString; var Dest: TArrayOfString);
-var
-  I, P: LongInt;
-begin
-  I := CountSubstring(Delim, S);
-  // If no delimiters, then Dest is a single-element array
-  if I = 0 then
-  begin
-    SetLength(Dest, 1);
-    Dest[0] := S;
-    exit();
-  end;
-  SetLength(Dest, I + 1);
-  for I := 0 to Length(Dest) - 1 do
-  begin
-    P := Pos(Delim, S);
-    if P > 0 then
-    begin
-      Dest[I] := Copy(S, 1, P - 1);
-      Delete(S, 1, P + Length(Delim) - 1);
-    end
-    else
-      Dest[I] := S;
-  end;
-end;
-
-function NormalizePath(Path: UnicodeString): UnicodeString;
-var
-  Parts: TArrayOfString;
-  Prefix: UnicodeString;
-  I: LongInt;
-begin
-  result := Path;
-  StrSplit(Path, '\', Parts);
-  // No delimiters
-  if Length(Parts) < 2 then
-    exit();
-  Prefix := '';
-  // Preserve leading '\\' or '\'
-  if Pos('\\', Path) = 1 then
-    Prefix := '\\'
-  else if Path[1] = '\' then
-    Prefix := '\';
-  Path := '';
-  for I := 0 to Length(Parts) - 1 do
-  begin
-    if Length(Parts[I]) > 0 then
-      JoinString(Path, Parts[I], '\');
-  end;
-  // If path is drive letter and ':' only, add trailing '\'
-  if (Length(Path) = 2) and (Path[2] = ':') then
-    Path := Path + '\';
-  result := Prefix + Path;
-end;
-
-function StrToIntDef(const S: UnicodeString; const Def: LongInt): LongInt;
-var
-  Code: Word;
-begin
-  Val(S, result, Code);
-  if Code > 0 then
-    result := Def;
-end;
-
-function StringToUnicodeString(const S: string; const CodePage: UINT): UnicodeString;
-var
-  NumChars, BufSize: DWORD;
-  pBuffer: PWideChar;
-begin
-  result := '';
-  // Get number of characters needed for buffer
-  NumChars := MultiByteToWideChar(CodePage,  // UINT   CodePage
-    0,                                       // DWORD  dwFlags
-    PChar(S),                                // LPCCH  lpMultiByteStr
-    -1,                                      // int    cbMultiByte
-    nil,                                     // LPWSTR lpWideCharStr
-    0);                                      // int    cchWideChar
-  if NumChars > 0 then
-  begin
-    BufSize := NumChars * SizeOf(WideChar);
-    GetMem(pBuffer, BufSize);
-    if MultiByteToWideChar(CP_OEMCP,  // UINT   CodePage
-      0,                              // DWORD  dwFlags
-      PChar(S),                       // LPCCH  lpMultiByteStr
-      -1,                             // int    cbMultiByte
-      pBuffer,                        // LPWSTR lpWideCharStr
-      NumChars) > 0 then              // int    cchWideChar
-      result := pBuffer;
-    FreeMem(pBuffer, BufSize);
-  end;
-end;
-
-function UnicodeStringToString(const S: UnicodeString; const CodePage: UINT): string;
-var
-  NumChars, BufSize: DWORD;
-  pBuffer: PChar;
-begin
-  result := '';
-  // Get number of characters needed for buffer
-  NumChars := WideCharToMultiByte(CodePage,  // UINT   CodePage
-    0,                                       // DWORD  dwFlags
-    PWideChar(S),                            // LPCWCH lpWideCharStr
-    -1,                                      // int    cchWideChar
-    nil,                                     // LPSTR  lpMultiByteStr
-    0,                                       // int    cbMultiByte
-    nil,                                     // LPCCH  lpDefaultChar
-    nil);                                    // LPBOOL lpUsedDefaultChar
-  if NumChars > 0 then
-  begin
-    BufSize := NumChars * SizeOf(Char);
-    GetMem(pBuffer, BufSize);
-    if WideCharToMultiByte(CP_OEMCP,  // UINT   CodePage
-      0,                              // DWORD  dwFlags
-      PWideChar(S),                   // LPCWCH lpWideCharStr
-      -1,                             // int    cchWideChar
-      pBuffer,                        // LPSTR  lpMultiByteStr
-      NumChars,                       // int    cbMultiByte
-      nil,                            // LPCCH  lpDefaultChar
-      nil) > 0 then                   // LPBOOL lpUsedDefaultChar
-      result := pBuffer;
-    FreeMem(pBuffer, BufSize);
-  end;
-end;
-
-begin
-end.