diff --git a/.github/workflows/ci-image.yml b/.github/workflows/ci-image.yml
new file mode 100644
index 00000000..424107ab
--- /dev/null
+++ b/.github/workflows/ci-image.yml
@@ -0,0 +1,43 @@
+name: CI Image
+
+on:
+  push:
+    branches: [master]
+    paths:
+      - 'dist/docker/Dockerfile'
+      - '.github/workflows/ci-image.yml'
+      - 'server/Makefile.PL'
+      - 'client/Makefile.PL'
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  build:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Compute image tag
+        id: meta
+        run: echo "tag=ghcr.io/${GITHUB_REPOSITORY,,}/build:latest" >> "$GITHUB_OUTPUT"
+
+      - uses: docker/setup-buildx-action@v4
+
+      - uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: docker/build-push-action@v7
+        with:
+          context: .
+          file: dist/docker/Dockerfile
+          target: base
+          push: true
+          tags: ${{ steps.meta.outputs.tag }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b39de9a2..44e05628 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,69 +13,41 @@ on:
 
 permissions:
   contents: read
+  packages: read
 
 jobs:
+  image-name:
+    runs-on: ubuntu-24.04
+    outputs:
+      ci: ${{ steps.set.outputs.ci }}
+    steps:
+      - id: set
+        run: echo "ci=ghcr.io/${GITHUB_REPOSITORY,,}/build:latest" >> "$GITHUB_OUTPUT"
+
   test:
-    runs-on: ubuntu-22.04
+    needs: image-name
+    runs-on: ubuntu-24.04
+    container:
+      image: ${{ needs.image-name.outputs.ci }}
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    services:
+      mysql:
+        image: mysql:8
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: nictool
+        options: >-
+          --health-cmd="mysqladmin ping -h 127.0.0.1"
+          --health-interval=5s
+          --health-timeout=3s
+          --health-retries=10
 
     steps:
       - uses: actions/checkout@v6
 
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \
-            expat \
-            cpanminus \
-            libdbix-simple-perl \
-            libdbd-mysql-perl \
-            apache2 \
-            libapache2-mod-perl2 \
-            libapache2-mod-perl2-dev \
-            libapache-dbi-perl \
-            gettext \
-            libxml2 \
-            libnet-ip-perl \
-            libxml-libxml-perl \
-            libxml-parser-perl \
-            libdigest-hmac-perl \
-            libjson-perl \
-            librpc-xml-perl \
-            libsoap-lite-perl \
-            libmodule-build-perl \
-            libmime-base32-perl \
-            libmime-base64-perl \
-            libbind-confparser-perl \
-            libssl-dev \
-            libcrypt-openssl-rsa-perl \
-            libcrypt-openssl-dsa-perl \
-            libnet-dns-perl \
-            libyaml-perl \
-            bind9utils \
-            libwww-perl \
-            liburi-perl \
-            libmime-tools-perl \
-            libmailtools-perl \
-            libfile-sharedir-perl \
-            libperl-prereqscanner-perl \
-            libdbi-perl \
-            libcgi-pm-perl \
-            libtest-pod-perl \
-            libtest-output-perl \
-            libtest-simple-perl \
-            default-mysql-client
-
-      - name: Wait for MySQL service
-        run: |
-          sudo /etc/init.d/mysql start
-          for attempt in $(seq 1 10); do
-            if mysqladmin ping -h 127.0.0.1 --silent; then
-              exit 0
-            fi
-            sleep 2
-          done
-          exit 1
-
       - name: Generate test credentials
         run: |
           DB_PW=$(openssl rand -base64 24)
@@ -85,42 +57,34 @@ jobs:
           echo "NICTOOL_DB_USER=nictool" >> "$GITHUB_ENV"
           echo "NICTOOL_DB_NAME=nictool" >> "$GITHUB_ENV"
           echo "DB_ENGINE=mysql" >> "$GITHUB_ENV"
-          echo "DB_HOSTNAME=localhost" >> "$GITHUB_ENV"
+          echo "DB_HOSTNAME=mysql" >> "$GITHUB_ENV"
           echo "ROOT_USER_EMAIL=ci@nictool.test" >> "$GITHUB_ENV"
           echo "ROOT_USER_PASSWORD=$ROOT_PW" >> "$GITHUB_ENV"
           echo "NICTOOL_CLIENT_DIR=$GITHUB_WORKSPACE/client" >> "$GITHUB_ENV"
-          echo "DB_SSL=1" >> "$GITHUB_ENV"
+
+      - name: Install NicTool client and server
+        run: |
+          cd "$GITHUB_WORKSPACE/client"
+          perl Makefile.PL
+          cpanm -n .
+
+          cd "$GITHUB_WORKSPACE/server"
+          perl Makefile.PL
+          cpanm -n .
 
       - name: Allow Apache to traverse workspace path
         run: |
-          # Ubuntu 21.04+ defaults home dirs to 750; www-data needs o+x to traverse
           dir="$GITHUB_WORKSPACE"
           while [ "$dir" != "/" ]; do
-            sudo chmod o+x "$dir"
+            chmod o+x "$dir"
             dir="$(dirname "$dir")"
           done
 
       - name: Set up NicTool configs, Apache, and TLS
-        run: sudo -E dist/setup/install-nictool.sh --nt-dir="$GITHUB_WORKSPACE"
-
-      - name: Install Perl modules for Apache/mod_perl
-        run: |
-          sudo cpanm --notest \
-            CryptX Crypt::Mac::HMAC Crypt::KeyDerivation \
-            Test::HTML::Lint Time::TAI64 DBD::MariaDB
-
-      - name: Install NicTool client and server
-        run: |
-          cd "$GITHUB_WORKSPACE/client"
-          perl Makefile.PL
-          sudo cpanm -n .
-
-          cd "$GITHUB_WORKSPACE/server"
-          perl Makefile.PL
-          sudo cpanm -n .
+        run: dist/setup/install-nictool.sh --nt-dir="$GITHUB_WORKSPACE"
 
-      - name: Restart Apache
-        run: sudo service apache2 restart || sudo cat /var/log/apache2/error.log
+      - name: Start Apache
+        run: apachectl start
 
       - name: Create NicTool test database
         run: |
@@ -139,9 +103,6 @@ jobs:
       - name: Failure diagnostics
         if: failure()
         run: |
-          pwd
           mysql --version
           apache2 -version
-          sudo cat /var/log/apache2/error.log || true
-          cat /etc/apache2/apache2.conf || true
-          ls /usr/lib/apache2/modules/ || true
+          cat /var/log/apache2/error.log || true
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0e705064..4cb75150 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -14,15 +14,15 @@ permissions:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Build Docker image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: dist/docker/Dockerfile
@@ -32,15 +32,15 @@ jobs:
 
   docker-tests:
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Load Docker image from cache
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: dist/docker/Dockerfile
@@ -72,15 +72,15 @@ jobs:
 
   e2e-tests:
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
       - name: Load Docker image from cache
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           file: dist/docker/Dockerfile
@@ -99,14 +99,14 @@ jobs:
         timeout-minutes: 5
 
       - name: Set up Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version: 22
           cache: npm
           cache-dependency-path: client/t/e2e/package-lock.json
 
       - name: Cache Playwright browsers
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: playwright-cache
         with:
           path: ~/.cache/ms-playwright
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..9fee4fe7
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,228 @@
+name: Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Release version (e.g., 2.41 or 2.41.1)'
+        required: true
+        type: string
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  preflight:
+    runs-on: ubuntu-24.04
+    outputs:
+      ci-image: ${{ steps.image.outputs.ci }}
+      current-version: ${{ steps.current.outputs.version }}
+    steps:
+      - name: Validate version format
+        run: |
+          VERSION="${{ inputs.version }}"
+          if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+(\.[0-9]+)?$ ]]; then
+            echo "::error::Invalid version format '$VERSION'. Expected X.Y or X.Y.Z (e.g., 2.41 or 2.41.1)"
+            exit 1
+          fi
+
+      - name: Check tag does not already exist
+        run: |
+          if git ls-remote --tags origin "refs/tags/v${{ inputs.version }}" | grep -q .; then
+            echo "::error::Tag v${{ inputs.version }} already exists on the remote. Delete it first or choose a different version."
+            exit 1
+          fi
+
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-tags: true
+
+      - name: Extract current version and validate
+        id: current
+        run: |
+          CURRENT=$(perl -ne "print \$1 if /\\bVERSION\\s*=\\s*'([^']+)'/" server/lib/NicToolServer.pm)
+          if [ -z "$CURRENT" ]; then
+            echo "::error::Could not extract version from server/lib/NicToolServer.pm"
+            exit 1
+          fi
+          echo "version=$CURRENT" >> "$GITHUB_OUTPUT"
+
+          NEW="${{ inputs.version }}"
+          if [ "$CURRENT" = "$NEW" ]; then
+            echo "::error::Version $NEW is already the current version"
+            exit 1
+          fi
+
+          OLDEST=$(printf '%s\n%s\n' "$CURRENT" "$NEW" | sort -V | head -n1)
+          if [ "$OLDEST" != "$CURRENT" ]; then
+            echo "::error::Version $NEW is older than current version $CURRENT"
+            exit 1
+          fi
+
+      - name: Compute CI image name
+        id: image
+        run: echo "ci=ghcr.io/${GITHUB_REPOSITORY,,}/build:latest" >> "$GITHUB_OUTPUT"
+
+  test:
+    needs: preflight
+    runs-on: ubuntu-24.04
+    container:
+      image: ${{ needs.preflight.outputs.ci-image }}
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    services:
+      mysql:
+        image: mysql:8
+        env:
+          MYSQL_ROOT_PASSWORD: root
+          MYSQL_DATABASE: nictool
+        options: >-
+          --health-cmd="mysqladmin ping -h 127.0.0.1"
+          --health-interval=5s
+          --health-timeout=3s
+          --health-retries=10
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Generate test credentials
+        run: |
+          DB_PW=$(openssl rand -base64 24)
+          ROOT_PW=$(openssl rand -base64 24)
+          echo "NICTOOL_DB_USER_PASSWORD=$DB_PW" >> "$GITHUB_ENV"
+          echo "DB_ROOT_PASSWORD=root" >> "$GITHUB_ENV"
+          echo "NICTOOL_DB_USER=nictool" >> "$GITHUB_ENV"
+          echo "NICTOOL_DB_NAME=nictool" >> "$GITHUB_ENV"
+          echo "DB_ENGINE=mysql" >> "$GITHUB_ENV"
+          echo "DB_HOSTNAME=mysql" >> "$GITHUB_ENV"
+          echo "ROOT_USER_EMAIL=ci@nictool.test" >> "$GITHUB_ENV"
+          echo "ROOT_USER_PASSWORD=$ROOT_PW" >> "$GITHUB_ENV"
+          echo "NICTOOL_CLIENT_DIR=$GITHUB_WORKSPACE/client" >> "$GITHUB_ENV"
+
+      - name: Install NicTool client and server
+        run: |
+          cd "$GITHUB_WORKSPACE/client"
+          perl Makefile.PL
+          cpanm -n .
+
+          cd "$GITHUB_WORKSPACE/server"
+          perl Makefile.PL
+          cpanm -n .
+
+      - name: Allow Apache to traverse workspace path
+        run: |
+          dir="$GITHUB_WORKSPACE"
+          while [ "$dir" != "/" ]; do
+            chmod o+x "$dir"
+            dir="$(dirname "$dir")"
+          done
+
+      - name: Set up NicTool configs, Apache, and TLS
+        run: dist/setup/install-nictool.sh --nt-dir="$GITHUB_WORKSPACE"
+
+      - name: Start Apache
+        run: apachectl start
+
+      - name: Create NicTool test database
+        run: |
+          cd "$GITHUB_WORKSPACE/server/sql"
+          echo "" | perl create_tables.pl --environment
+
+      - name: Create test user and test.cfg
+        run: perl dist/setup/setup-test-env.pl
+
+      - name: Run client tests
+        run: make -C "$GITHUB_WORKSPACE/client" test
+
+      - name: Run server tests
+        run: make -C "$GITHUB_WORKSPACE/server" test
+
+      - name: Failure diagnostics
+        if: failure()
+        run: |
+          mysql --version
+          apache2 -version
+          cat /var/log/apache2/error.log || true
+
+  release:
+    needs: [preflight, test]
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-tags: true
+
+      - name: Setup Perl
+        uses: shogo82148/actions-setup-perl@v1
+        with:
+          perl-version: '5.38'
+
+      - name: Bump version
+        run: |
+          chmod +x .release/version-bump.sh
+          .release/version-bump.sh "${{ needs.preflight.outputs.current-version }}" "${{ inputs.version }}"
+
+      - name: Commit and tag
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add -u
+          git commit -m "release v${{ inputs.version }}"
+          git tag "v${{ inputs.version }}"
+          git push origin HEAD --tags
+
+      - name: Build distributions
+        run: |
+          cd "$GITHUB_WORKSPACE/server/api"
+          perl Makefile.PL && make && make dist
+
+          cd "$GITHUB_WORKSPACE"
+          perl Makefile.PL && make bundle
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ inputs.version }}
+          name: NicTool v${{ inputs.version }}
+          generate_release_notes: true
+          files: |
+            NicTool.tar.gz
+            client/NicToolClient-*.tar.gz
+            server/NicToolServer-*.tar.gz
+            server/api/NicTool-*.tar.gz
+
+  docker:
+    needs: release
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          ref: v${{ inputs.version }}
+
+      - uses: docker/setup-buildx-action@v4
+
+      - uses: docker/login-action@v4
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Compute image tags
+        id: meta
+        run: |
+          REPO="${GITHUB_REPOSITORY,,}"
+          echo "tags=ghcr.io/${REPO}/dist:${{ inputs.version }},ghcr.io/${REPO}/dist:latest" >> "$GITHUB_OUTPUT"
+
+      - uses: docker/build-push-action@v7
+        with:
+          context: .
+          file: dist/docker/Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
diff --git a/.gitignore b/.gitignore
index b66cac80..8b057eb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 blib
 pm_to_blib
 MYMETA.*
+META.yml
 Makefile
 MANIFEST.bak
 *~
diff --git a/.release/version-bump.sh b/.release/version-bump.sh
index 46efd485..56539408 100755
--- a/.release/version-bump.sh
+++ b/.release/version-bump.sh
@@ -10,13 +10,9 @@ if [ -z "$2" ]; then
 	exit 2
 fi
 
-alias gfind='find . -type d -name node_modules -prune -o -type d -name .git -prune -o -type d -name .build -prune -o -type d -name bower_components -prune -o -type f -print'
+alias gfind='find . -type d -name node_modules -prune -o -type d -name .git -prune -o -type d -name .build -prune -o -type d -name bower_components -prune -o -type d -name .github -prune -o -type f -print'
 
 grep $VERSION `gfind` | cut -f1 -d':' | sort -u > versions.txt
-sed -i '' \
-	-e "/version/ s/$1/$2/" \
-	-e "/VERSION/ s/$1/$2/" \
-	-e "/v$1/ s/$1/$2/" \
-	`cat versions.txt`
+perl -pi -e "s/\b$1\b/$2/g if /version|VERSION|v$1/" `cat versions.txt`
 rm versions.txt
 
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..dba13ed2
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/MANIFEST b/MANIFEST
index 7ddb7543..41a8fbe6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -27,7 +27,7 @@ docs/zonesfuncs.htm
 Makefile.PL
 MANIFEST			This list of files
 MANIFEST.SKIP
-META.yml
+LICENSE
 README
 README.md
 TESTIMONIALS.md
diff --git a/META.yml b/META.yml
deleted file mode 100644
index 005ed44f..00000000
--- a/META.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-abstract: unknown
-author:
-  - unknown
-build_requires:
-  Dist::Zilla: 0
-configure_requires:
-  ExtUtils::MakeMaker: 0
-dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 6.64, CPAN::Meta::Converter version 2.120921'
-license: unknown
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
-name: NicTool-Bundle
-no_index:
-  directory:
-    - t
-    - inc
-requires:
-  perl: 5.008001
-version: 2.19
diff --git a/Makefile.PL b/Makefile.PL
index 70d1a395..142e4c5e 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -5,11 +5,11 @@ WriteMakefile(
     VERSION_FROM => "server/lib/NicToolServer.pm",
     AUTHOR       => 'Matt Simerson <msimerson@cpan.org>',
     ABSTRACT     => 'NicTool DNS Management suite',
-    LICENSE      => 'open_source',
+    LICENSE      => 'agpl_3',
 
     #dist               => { COMPRESS => 'gzip -9f', },
     dist               => { COMPRESS => 'bzip2', SUFFIX => '.bz2' },
-    'MIN_PERL_VERSION' => 5.008001,
+    'MIN_PERL_VERSION' => 5.010,
     'BUILD_REQUIRES'   => {},
     PREREQ_PM          => {},
     TEST_REQUIRES      => {},
diff --git a/README.md b/README.md
index 9c82eaaa..d61dd863 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## [NicTool](http://www.nictool.com)
 
-NicTool is a open source DNS management suite that takes the headaches out of managing DNS data.  NicTool provides a easy to use web interface that allows users with little dns knowledge the ability to manage dns zones and records.
+NicTool is an open source DNS management suite that takes the headaches out of managing DNS data. NicTool provides an easy-to-use web interface that allows users with little DNS knowledge the ability to manage DNS zones and records.
 
 ### Features
 
@@ -31,7 +31,16 @@ NicTool is a open source DNS management suite that takes the headaches out of ma
 
 * NicTool Server - Exposes the DNS data via a SOAP web service.
 * NicTool API - The NicTool API is what connects to the NicTool Server. The format of requests is defined in the reference API at http://www.nictool.com/docs/api/
-* NicTool Client - A CGI application that provides a web interface for managing DNS data. NicTool Client has customizable HTML templates and a CSS style sheet. It is slowly becoming a modern JS web app
+* NicTool Client - A CGI application that provides a web interface for managing DNS data. NicTool Client has customizable HTML templates and a CSS style sheet.
+
+### NicTool 3
+
+The next generation of NicTool is a JavaScript rewrite at [github.com/NicTool/api](https://github.com/NicTool/api) (v3, Node.js + REST API). Related `@nictool` npm packages:
+
+* [validate](https://www.npmjs.com/package/@nictool/validate)
+* [dns-resource-record](https://www.npmjs.com/package/@nictool/dns-resource-record)
+* [dns-zone](https://www.npmjs.com/package/@nictool/dns-zone)
+* [dns-nameserver](https://www.npmjs.com/package/@nictool/dns-nameserver)
 
 ### Testimonials and NicTool Users
 
@@ -44,8 +53,8 @@ See [AUTHORS.md](https://github.com/nictool/NicTool/blob/master/AUTHORS.md)
 
 ### Support
 
-* [Commercial Support](http://www.tnpi.net/cart/index.php/categories/nictool)
-* [Forums](http://www.tnpi.net/support/forums/index.php/board,10.0.html)
-* [Mailing Lists](https://mail.theartfarm.com/list-archives/?1)
+* [Commercial Support](https://www.tnpi.net/cart/index.php/categories/nictool)
+* [Forums](https://www.tnpi.net/support/forums/)
 * [Email](mailto:support@nictool.com) - Requests not accompanied by payments are handled on a "best effort" basis.
+* [GitHub Issues](https://github.com/NicTool/NicTool/issues)
 * [Wiki](https://github.com/nictool/NicTool/wiki)
diff --git a/client/LICENSE b/client/LICENSE
index 5331c916..53fafb60 100644
--- a/client/LICENSE
+++ b/client/LICENSE
@@ -1,4 +1,4 @@
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/client/MANIFEST b/client/MANIFEST
index 13ff555d..67913a3b 100644
--- a/client/MANIFEST
+++ b/client/MANIFEST
@@ -5,7 +5,6 @@ INSTALL
 LICENSE
 MANIFEST
 MANIFEST.SKIP
-META.yml
 Makefile.PL
 TODO.md
 bin/install_deps.pl
diff --git a/client/META.yml b/client/META.yml
deleted file mode 100644
index d767dedf..00000000
--- a/client/META.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-abstract: 'CGI Interface to NicToolServer'
-author:
-  - 'Matt Simerson <msimerson@cpan.org>'
-  - 'Damon Edwards'
-  - 'Abe Shelton'
-  - 'Greg Schueler'
-build_requires:
-  English: '0'
-  Test::More: '0'
-  lib: '0'
-  warnings: '0'
-configure_requires:
-  ExtUtils::MakeMaker: '0'
-dynamic_config: 0
-generated_by: 'CPAN::Meta::Converter version 2.143240'
-license: open_source
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: '1.4'
-name: NicToolClient
-requires:
-  CGI: '3'
-  Data::Dumper: '0'
-  JSON: '0'
-  LWP::UserAgent: '1'
-  RPC::XML: '1'
-  RPC::XML::Parser: '0'
-  SOAP::Lite: '0'
-  XML::Parser: '0'
-  strict: '0'
-  vars: '0'
-version: '2.40'
diff --git a/client/Makefile.PL b/client/Makefile.PL
index 07535fb5..9a22e727 100644
--- a/client/Makefile.PL
+++ b/client/Makefile.PL
@@ -5,11 +5,12 @@ use ExtUtils::MakeMaker;
 
 my %WriteMakefileArgs = (
     "ABSTRACT" => "CGI Interface to NicToolServer",
-    "AUTHOR"   => "Matt Simerson <msimerson\@cpan.org>, Damon Edwards, Abe Shelton, Greg Schueler",
+    "AUTHOR"   => "Matt Simerson <msimerson\@cpan.org>, Damon Edwards, Abraham Ingersoll, Greg Schueler",
     "CONFIGURE_REQUIRES" => { "ExtUtils::MakeMaker" => 0 },
     "DISTNAME"           => "NicToolClient",
     "EXE_FILES"          => [],
-    "LICENSE"            => "open_source",
+    "LICENSE"            => "agpl_3",
+    "MIN_PERL_VERSION"   => "5.010",
     "NAME"               => "NicToolClient",
     "PREREQ_PM"          => {
         "CGI"              => 3,
diff --git a/client/htdocs/delegate_zones.cgi b/client/htdocs/delegate_zones.cgi
index ba77f0d9..73ee0573 100755
--- a/client/htdocs/delegate_zones.cgi
+++ b/client/htdocs/delegate_zones.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.05+ Copyright 2004-2008 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/group.cgi b/client/htdocs/group.cgi
index 9933cea4..765b400c 100755
--- a/client/htdocs/group.cgi
+++ b/client/htdocs/group.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/group_log.cgi b/client/htdocs/group_log.cgi
index 710dcba5..cfdedeef 100755
--- a/client/htdocs/group_log.cgi
+++ b/client/htdocs/group_log.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/group_nameservers.cgi b/client/htdocs/group_nameservers.cgi
index fddeb06f..1e240a30 100755
--- a/client/htdocs/group_nameservers.cgi
+++ b/client/htdocs/group_nameservers.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/group_users.cgi b/client/htdocs/group_users.cgi
index 71835bab..1e0be8a4 100755
--- a/client/htdocs/group_users.cgi
+++ b/client/htdocs/group_users.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/group_zones.cgi b/client/htdocs/group_zones.cgi
index 3145a987..b31198ae 100755
--- a/client/htdocs/group_zones.cgi
+++ b/client/htdocs/group_zones.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/group_zones_log.cgi b/client/htdocs/group_zones_log.cgi
index af7f2c33..bc033721 100755
--- a/client/htdocs/group_zones_log.cgi
+++ b/client/htdocs/group_zones_log.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/group_zones_query_log.cgi b/client/htdocs/group_zones_query_log.cgi
index 3ad2df56..806994f6 100755
--- a/client/htdocs/group_zones_query_log.cgi
+++ b/client/htdocs/group_zones_query_log.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/help.cgi b/client/htdocs/help.cgi
index 1ed9dbf9..3a02fd57 100755
--- a/client/htdocs/help.cgi
+++ b/client/htdocs/help.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/index.cgi b/client/htdocs/index.cgi
index 78000f02..f9779161 100755
--- a/client/htdocs/index.cgi
+++ b/client/htdocs/index.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/move_nameservers.cgi b/client/htdocs/move_nameservers.cgi
index 8d2a23bd..31a7fddb 100755
--- a/client/htdocs/move_nameservers.cgi
+++ b/client/htdocs/move_nameservers.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/move_users.cgi b/client/htdocs/move_users.cgi
index 669abd1c..3ce69e1c 100755
--- a/client/htdocs/move_users.cgi
+++ b/client/htdocs/move_users.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/move_zones.cgi b/client/htdocs/move_zones.cgi
index 904d6385..b61717b6 100755
--- a/client/htdocs/move_zones.cgi
+++ b/client/htdocs/move_zones.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/nav.cgi b/client/htdocs/nav.cgi
index 748639c9..0eb58c0a 100755
--- a/client/htdocs/nav.cgi
+++ b/client/htdocs/nav.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/user.cgi b/client/htdocs/user.cgi
index 0bd5f337..819449b1 100755
--- a/client/htdocs/user.cgi
+++ b/client/htdocs/user.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/zone.cgi b/client/htdocs/zone.cgi
index f768652e..2bfb121a 100755
--- a/client/htdocs/zone.cgi
+++ b/client/htdocs/zone.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01+ Copyright 2004-2008 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/htdocs/zone_record_log.cgi b/client/htdocs/zone_record_log.cgi
index 628d7694..b15be197 100755
--- a/client/htdocs/zone_record_log.cgi
+++ b/client/htdocs/zone_record_log.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/client/lib/NicToolClient.pm b/client/lib/NicToolClient.pm
index 25c2cc9d..6755372c 100644
--- a/client/lib/NicToolClient.pm
+++ b/client/lib/NicToolClient.pm
@@ -1636,7 +1636,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -1646,7 +1646,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/client/lib/NicToolServerAPI.pm b/client/lib/NicToolServerAPI.pm
index 004ae6a0..3729bef8 100644
--- a/client/lib/NicToolServerAPI.pm
+++ b/client/lib/NicToolServerAPI.pm
@@ -236,7 +236,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -246,7 +246,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/client/lib/nictoolclient.conf.dist b/client/lib/nictoolclient.conf.dist
index 647a69fb..a7073653 100644
--- a/client/lib/nictoolclient.conf.dist
+++ b/client/lib/nictoolclient.conf.dist
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/dist/docker/Dockerfile b/dist/docker/Dockerfile
index d730a27c..dcf93ef5 100644
--- a/dist/docker/Dockerfile
+++ b/dist/docker/Dockerfile
@@ -1,4 +1,6 @@
-FROM debian:bookworm
+# ---- base: all system + CPAN deps, Apache configured, no app source ----
+# CI builds stop here (--target base).  Production builds continue below.
+FROM debian:bookworm AS base
 
 ENV DEBIAN_FRONTEND=noninteractive LANG=en_US.UTF-8 LC_ALL=C.UTF-8
 
@@ -16,7 +18,7 @@ RUN apt-get -q update && apt-get install -qy \
       libexpat-dev \
       gettext \
       bind9utils \
-      mariadb-client \
+      default-mysql-client \
       openssl \
       libdbix-simple-perl \
       libdbd-mysql-perl \
@@ -49,13 +51,14 @@ RUN apt-get -q update && apt-get install -qy \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Copy only Makefile.PL files first for dependency caching
-COPY server/Makefile.PL /usr/local/nictool/server/Makefile.PL
-COPY client/Makefile.PL /usr/local/nictool/client/Makefile.PL
+# Copy only Makefile.PL files for dependency caching
+COPY server/Makefile.PL /tmp/nictool/server/Makefile.PL
+COPY client/Makefile.PL /tmp/nictool/client/Makefile.PL
 
 # Install Perl dependencies (cached unless Makefile.PL changes)
-RUN cd /usr/local/nictool/server && perl Makefile.PL && cpanm -n . \
-    && cd /usr/local/nictool/client && perl Makefile.PL && cpanm -n .
+RUN cd /tmp/nictool/server && perl Makefile.PL && cpanm -n . \
+    && cd /tmp/nictool/client && perl Makefile.PL && cpanm -n . \
+    && rm -rf /tmp/nictool
 
 # Additional Perl modules not in Makefile.PL
 RUN cpanm --notest \
@@ -67,12 +70,15 @@ RUN cpanm --notest \
 RUN a2dismod mpm_event && a2enmod mpm_prefork && a2enmod ssl \
     && rm -rf /etc/apache2/sites-enabled/* /etc/apache2/sites-available/*
 
+# ---- production: install app source and entrypoint ----
+FROM base AS production
+
 # Now copy the full source (only this layer invalidates on code changes)
 COPY server/ /usr/local/nictool/server/
 COPY client/ /usr/local/nictool/client/
 COPY dist/   /usr/local/nictool/dist/
 
-# Install the actual NicTool modules (deps are cached above)
+# Install the actual NicTool modules (deps are cached in base)
 RUN cd /usr/local/nictool/server && perl Makefile.PL && make install \
     && cd /usr/local/nictool/client && perl Makefile.PL && make install
 
diff --git a/server/LICENSE b/server/LICENSE
index 5331c916..53fafb60 100644
--- a/server/LICENSE
+++ b/server/LICENSE
@@ -1,4 +1,4 @@
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/MANIFEST b/server/MANIFEST
index e42c4358..b907620e 100644
--- a/server/MANIFEST
+++ b/server/MANIFEST
@@ -4,7 +4,6 @@ INSTALL
 LICENSE
 MANIFEST
 MANIFEST.SKIP
-META.yml
 Makefile.PL
 TODO.md
 UPGRADE
@@ -12,7 +11,6 @@ api/Changes
 api/LICENSE
 api/MANIFEST
 api/Makefile.PL
-api/META.yml
 api/README
 api/contrib/DNS.pm
 api/contrib/addserver.pl
diff --git a/server/META.yml b/server/META.yml
deleted file mode 100644
index 88a1356b..00000000
--- a/server/META.yml
+++ /dev/null
@@ -1,67 +0,0 @@
----
-abstract: 'NicTool API reference server'
-author:
-  - 'Matt Simerson <msimerson@cpan.org>'
-  - 'Damon Edwards'
-  - 'Abe Shelton'
-  - 'Greg Schueler'
-build_requires:
-  Exporter: '0'
-  Test: '0'
-  Test::More: '0'
-configure_requires:
-  ExtUtils::MakeMaker: '0'
-dynamic_config: 0
-generated_by: 'CPAN::Meta::Converter version 2.143240'
-license: open_source
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: '1.4'
-name: NicToolServer
-recommends:
-  BIND::Conf_Parser: '1'
-  JSON: '1'
-  Mozilla::CA: '1'
-  Net::DNS::ZoneFile: '1'
-  Net::LDAP: '0.65'
-  NicTool: '0'
-requires:
-  APR::Table: '0'
-  Apache::DBI: '0'
-  BIND::Conf_Parser: '0'
-  CGI: '3'
-  Crypt::KeyDerivation: '0'
-  Crypt::Mac::HMAC: '0'
-  CryptX: '0.021'
-  Cwd: '0'
-  DBD::MariaDB: '0'
-  DBI: '1.20'
-  DBIx::Simple: '0'
-  Data::Dumper: '0'
-  English: '0'
-  File::Copy: '0'
-  File::Path: '0'
-  IO::File: '0'
-  JSON: '0'
-  LWP::UserAgent: '0'
-  MIME::Base32: '0'
-  MIME::Base64: '0'
-  Net::IP: '0'
-  NicTool: '0'
-  Params::Validate: '0.8'
-  RPC::XML: '0'
-  RPC::XML::Parser: '0'
-  SOAP::Lite: '0.51'
-  Scalar::Util: '0'
-  Time::HiRes: '1.9'
-  Time::Local: '0'
-  Time::TAI64: '2'
-  XML::Parser: '0'
-  constant: '0'
-  lib: '0'
-  mod_perl: '0'
-  parent: '0.2'
-  strict: '0'
-  vars: '0'
-  warnings: '0'
-version: '2.40'
diff --git a/server/Makefile.PL b/server/Makefile.PL
index 2a21f6b5..43cb5390 100644
--- a/server/Makefile.PL
+++ b/server/Makefile.PL
@@ -5,11 +5,12 @@ use ExtUtils::MakeMaker;
 
 my %WriteMakefileArgs = (
     "ABSTRACT" => "NicTool API reference server",
-    "AUTHOR"   => "Matt Simerson <msimerson\@cpan.org>, Damon Edwards, Abe Shelton, Greg Schueler",
+    "AUTHOR"   => "Matt Simerson <msimerson\@cpan.org>, Damon Edwards, Abraham Ingersoll, Greg Schueler",
     "CONFIGURE_REQUIRES" => { "ExtUtils::MakeMaker" => 0 },
     "DISTNAME"           => "NicToolServer",
     "EXE_FILES"          => [],
-    "LICENSE"            => "open_source",
+    "LICENSE"            => "agpl_3",
+    "MIN_PERL_VERSION"   => "5.010",
     "NAME"               => "NicToolServer",
     "PREREQ_PM"          => {
         "Apache::DBI"          => 0,
diff --git a/server/api/LICENSE b/server/api/LICENSE
index 5331c916..53fafb60 100644
--- a/server/api/LICENSE
+++ b/server/api/LICENSE
@@ -1,4 +1,4 @@
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/MANIFEST b/server/api/MANIFEST
index 87696159..63b18422 100644
--- a/server/api/MANIFEST
+++ b/server/api/MANIFEST
@@ -4,7 +4,6 @@ Makefile.PL
 README
 contrib/update_group_nameservers.pl
 LICENSE
-META.yml
 contrib/addserver.pl
 contrib/DNS.pm
 contrib/zone2nic.pl
diff --git a/server/api/META.yml b/server/api/META.yml
deleted file mode 100644
index 8213f9b1..00000000
--- a/server/api/META.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-abstract: 'A client framework for interaction with a NicToolServer via SOAP or XML-RPC.'
-author:
-  - 'Matt Simerson <msimerson@cpan.org>'
-  - 'Damon Edwards'
-  - 'Abe Shelton'
-  - 'Greg Schueler'
-build_requires:
-  Test: '0'
-dynamic_config: 0
-generated_by: 'CPAN::Meta::Converter version 2.143240'
-license: open_source
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: '1.4'
-name: NicTool
-requires:
-  Carp: '0'
-  Data::Dumper: '0'
-  LWP: '0'
-  RPC::XML: '1'
-  RPC::XML::Parser: '0'
-  SOAP::Lite: '0.51'
-  lib: '0'
-  parent: '0'
-  strict: '0'
-version: '1.02'
diff --git a/server/api/Makefile.PL b/server/api/Makefile.PL
index 6aa7bd10..11ba0edd 100644
--- a/server/api/Makefile.PL
+++ b/server/api/Makefile.PL
@@ -6,7 +6,7 @@ use ExtUtils::MakeMaker 6.30;
 
 my %WriteMakefileArgs = (
     "ABSTRACT" => "A client framework for interaction with a NicToolServer via SOAP or XML-RPC.",
-    "AUTHOR"   => "Matt Simerson <msimerson\@cpan.org>, Damon Edwards, Abe Shelton, Greg Schueler",
+    "AUTHOR"   => "Matt Simerson <msimerson\@cpan.org>, Damon Edwards, Abraham Ingersoll, Greg Schueler",
     "BUILD_REQUIRES" => {
         "English"    => 0,
         "Test"       => 0,
@@ -17,7 +17,8 @@ my %WriteMakefileArgs = (
     "CONFIGURE_REQUIRES" => { "ExtUtils::MakeMaker" => "6.30" },
     "DISTNAME"           => "NicTool",
     "EXE_FILES"          => [],
-    "LICENSE"            => "open_source",
+    "LICENSE"            => "agpl_3",
+    "MIN_PERL_VERSION"   => "5.010",
     "NAME"               => "NicTool",
     "PREREQ_PM"          => {
         "Carp"             => 0,
diff --git a/server/api/lib/NicTool.pm b/server/api/lib/NicTool.pm
index 92ec7784..a85d1002 100755
--- a/server/api/lib/NicTool.pm
+++ b/server/api/lib/NicTool.pm
@@ -537,7 +537,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -547,7 +547,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2011 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2011 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
@@ -613,7 +613,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -623,7 +623,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/API.pm b/server/api/lib/NicTool/API.pm
index 0ea359ba..50ee8c70 100644
--- a/server/api/lib/NicTool/API.pm
+++ b/server/api/lib/NicTool/API.pm
@@ -2,7 +2,7 @@
 use strict;
 ###
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -664,7 +664,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -674,7 +674,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/Cache.pm b/server/api/lib/NicTool/Cache.pm
index 7e403ca8..09a75889 100644
--- a/server/api/lib/NicTool/Cache.pm
+++ b/server/api/lib/NicTool/Cache.pm
@@ -4,7 +4,7 @@ use strict;
 # a simple path based cache
 ###
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -86,7 +86,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -96,7 +96,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/DBObject.pm b/server/api/lib/NicTool/DBObject.pm
index 2c769f02..5a575995 100644
--- a/server/api/lib/NicTool/DBObject.pm
+++ b/server/api/lib/NicTool/DBObject.pm
@@ -1,7 +1,7 @@
 package NicTool::DBObject;
 use strict;
 ###
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -256,7 +256,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -266,7 +266,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/Group.pm b/server/api/lib/NicTool/Group.pm
index eda4406c..6eea6062 100644
--- a/server/api/lib/NicTool/Group.pm
+++ b/server/api/lib/NicTool/Group.pm
@@ -1,6 +1,6 @@
 package NicTool::Group;
 ###
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -238,7 +238,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -248,7 +248,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/List.pm b/server/api/lib/NicTool/List.pm
index 5fe26ccd..a0572cc2 100644
--- a/server/api/lib/NicTool/List.pm
+++ b/server/api/lib/NicTool/List.pm
@@ -1,6 +1,6 @@
 package NicTool::List;
 ###
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -270,7 +270,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -280,7 +280,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/NTObject.pm b/server/api/lib/NicTool/NTObject.pm
index 0a5961a9..1d3c245a 100644
--- a/server/api/lib/NicTool/NTObject.pm
+++ b/server/api/lib/NicTool/NTObject.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ###
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -160,7 +160,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -170,7 +170,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/Nameserver.pm b/server/api/lib/NicTool/Nameserver.pm
index 7d7e1798..ea44cdbc 100644
--- a/server/api/lib/NicTool/Nameserver.pm
+++ b/server/api/lib/NicTool/Nameserver.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ###
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -62,7 +62,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -72,7 +72,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/Record.pm b/server/api/lib/NicTool/Record.pm
index 8962b7bc..db04e15f 100644
--- a/server/api/lib/NicTool/Record.pm
+++ b/server/api/lib/NicTool/Record.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ###
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -127,7 +127,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -137,7 +137,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/Result.pm b/server/api/lib/NicTool/Result.pm
index bd30c4f4..0e56de4f 100644
--- a/server/api/lib/NicTool/Result.pm
+++ b/server/api/lib/NicTool/Result.pm
@@ -177,7 +177,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -187,7 +187,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2011 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2011 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
@@ -207,7 +207,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -217,7 +217,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/Transport.pm b/server/api/lib/NicTool/Transport.pm
index 930cfd9a..ad855dfe 100644
--- a/server/api/lib/NicTool/Transport.pm
+++ b/server/api/lib/NicTool/Transport.pm
@@ -2,7 +2,7 @@ package NicTool::Transport;
 
 # ABSTRACT: support class and factory for different Transport types
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -119,7 +119,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -129,7 +129,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/Transport/SOAP.pm b/server/api/lib/NicTool/Transport/SOAP.pm
index dfcdc741..af5f3f03 100644
--- a/server/api/lib/NicTool/Transport/SOAP.pm
+++ b/server/api/lib/NicTool/Transport/SOAP.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # ABSTRACT: SOAP transport module
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -126,7 +126,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -136,7 +136,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/Transport/XMLRPC.pm b/server/api/lib/NicTool/Transport/XMLRPC.pm
index 1536fcb6..1ed882b1 100644
--- a/server/api/lib/NicTool/Transport/XMLRPC.pm
+++ b/server/api/lib/NicTool/Transport/XMLRPC.pm
@@ -3,7 +3,7 @@
 # XMLRPC transport module
 ###
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -131,7 +131,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -141,7 +141,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/User.pm b/server/api/lib/NicTool/User.pm
index c8709004..08548f0d 100644
--- a/server/api/lib/NicTool/User.pm
+++ b/server/api/lib/NicTool/User.pm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 ###
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -149,7 +149,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -159,7 +159,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/lib/NicTool/Zone.pm b/server/api/lib/NicTool/Zone.pm
index fae2f8a4..7f66d720 100644
--- a/server/api/lib/NicTool/Zone.pm
+++ b/server/api/lib/NicTool/Zone.pm
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 ###
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
@@ -189,7 +189,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -199,7 +199,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/api/t/cleanup.pl b/server/api/t/cleanup.pl
index 3186860c..df8e0ac8 100755
--- a/server/api/t/cleanup.pl
+++ b/server/api/t/cleanup.pl
@@ -3,7 +3,7 @@
 # Recursively delete a list of Groups and all of it's objects + groups.
 # usage: cleanup.pl <group_id> [...]
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/lib/NicToolServer.pm b/server/lib/NicToolServer.pm
index 091fcf92..db009fc5 100755
--- a/server/lib/NicToolServer.pm
+++ b/server/lib/NicToolServer.pm
@@ -1974,7 +1974,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -1985,7 +1985,7 @@ Greg Schueler
 =head1 COPYRIGHT AND LICENSE
 
 This software is Copyright (c) 2017 by The Network People, Inc.
-This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Client.pm b/server/lib/NicToolServer/Client.pm
index ccb277e8..ce2cf168 100644
--- a/server/lib/NicToolServer/Client.pm
+++ b/server/lib/NicToolServer/Client.pm
@@ -99,7 +99,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -109,7 +109,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Client/SOAP.pm b/server/lib/NicToolServer/Client/SOAP.pm
index c11e84b4..5781ab36 100644
--- a/server/lib/NicToolServer/Client/SOAP.pm
+++ b/server/lib/NicToolServer/Client/SOAP.pm
@@ -48,7 +48,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -58,7 +58,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Export.pm b/server/lib/NicToolServer/Export.pm
index fe52b203..55b82dcb 100644
--- a/server/lib/NicToolServer/Export.pm
+++ b/server/lib/NicToolServer/Export.pm
@@ -1060,7 +1060,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -1070,7 +1070,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Export/BIND.pm b/server/lib/NicToolServer/Export/BIND.pm
index 2d08c0e0..460ac5b7 100644
--- a/server/lib/NicToolServer/Export/BIND.pm
+++ b/server/lib/NicToolServer/Export/BIND.pm
@@ -529,7 +529,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -539,7 +539,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Export/BIND/nsupdate.pm b/server/lib/NicToolServer/Export/BIND/nsupdate.pm
index 1a568e99..06d14676 100644
--- a/server/lib/NicToolServer/Export/BIND/nsupdate.pm
+++ b/server/lib/NicToolServer/Export/BIND/nsupdate.pm
@@ -547,7 +547,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -557,7 +557,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Export/Base.pm b/server/lib/NicToolServer/Export/Base.pm
index 71da50dd..14cb6d34 100644
--- a/server/lib/NicToolServer/Export/Base.pm
+++ b/server/lib/NicToolServer/Export/Base.pm
@@ -137,7 +137,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -147,7 +147,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Export/DynECT.pm b/server/lib/NicToolServer/Export/DynECT.pm
index 50b7feef..b7cb78a6 100644
--- a/server/lib/NicToolServer/Export/DynECT.pm
+++ b/server/lib/NicToolServer/Export/DynECT.pm
@@ -412,7 +412,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -422,7 +422,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Export/Knot.pm b/server/lib/NicToolServer/Export/Knot.pm
index 113c78f5..1e2ffdd6 100644
--- a/server/lib/NicToolServer/Export/Knot.pm
+++ b/server/lib/NicToolServer/Export/Knot.pm
@@ -182,7 +182,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -192,7 +192,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Export/MaraDNS.pm b/server/lib/NicToolServer/Export/MaraDNS.pm
index b40636fe..79dc9461 100644
--- a/server/lib/NicToolServer/Export/MaraDNS.pm
+++ b/server/lib/NicToolServer/Export/MaraDNS.pm
@@ -94,7 +94,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -104,7 +104,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Export/NSD.pm b/server/lib/NicToolServer/Export/NSD.pm
index 5c8d46c3..eb04a828 100644
--- a/server/lib/NicToolServer/Export/NSD.pm
+++ b/server/lib/NicToolServer/Export/NSD.pm
@@ -120,7 +120,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -130,7 +130,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Export/PowerDNS.pm b/server/lib/NicToolServer/Export/PowerDNS.pm
index 393effd6..ec531347 100644
--- a/server/lib/NicToolServer/Export/PowerDNS.pm
+++ b/server/lib/NicToolServer/Export/PowerDNS.pm
@@ -103,7 +103,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -113,7 +113,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Export/tinydns.pm b/server/lib/NicToolServer/Export/tinydns.pm
index 47c99c50..89dbb9e4 100644
--- a/server/lib/NicToolServer/Export/tinydns.pm
+++ b/server/lib/NicToolServer/Export/tinydns.pm
@@ -966,7 +966,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -976,7 +976,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Group.pm b/server/lib/NicToolServer/Group.pm
index e0b46b2f..df3e92f0 100644
--- a/server/lib/NicToolServer/Group.pm
+++ b/server/lib/NicToolServer/Group.pm
@@ -612,7 +612,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -622,7 +622,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Group/Sanity.pm b/server/lib/NicToolServer/Group/Sanity.pm
index 267fccaa..5850e9b9 100755
--- a/server/lib/NicToolServer/Group/Sanity.pm
+++ b/server/lib/NicToolServer/Group/Sanity.pm
@@ -140,7 +140,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -150,7 +150,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Import/BIND.pm b/server/lib/NicToolServer/Import/BIND.pm
index 1aa6a364..44ac3063 100755
--- a/server/lib/NicToolServer/Import/BIND.pm
+++ b/server/lib/NicToolServer/Import/BIND.pm
@@ -401,7 +401,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -411,7 +411,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Import/Base.pm b/server/lib/NicToolServer/Import/Base.pm
index 7c8843f2..b1366d26 100755
--- a/server/lib/NicToolServer/Import/Base.pm
+++ b/server/lib/NicToolServer/Import/Base.pm
@@ -415,7 +415,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -425,7 +425,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Import/tinydns.pm b/server/lib/NicToolServer/Import/tinydns.pm
index 8a718e94..6bf45ccc 100755
--- a/server/lib/NicToolServer/Import/tinydns.pm
+++ b/server/lib/NicToolServer/Import/tinydns.pm
@@ -554,7 +554,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -564,7 +564,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Nameserver.pm b/server/lib/NicToolServer/Nameserver.pm
index cf896b3a..52b5f441 100644
--- a/server/lib/NicToolServer/Nameserver.pm
+++ b/server/lib/NicToolServer/Nameserver.pm
@@ -455,7 +455,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -465,7 +465,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Nameserver/Sanity.pm b/server/lib/NicToolServer/Nameserver/Sanity.pm
index ee1e6b57..3547d16c 100644
--- a/server/lib/NicToolServer/Nameserver/Sanity.pm
+++ b/server/lib/NicToolServer/Nameserver/Sanity.pm
@@ -203,7 +203,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -213,7 +213,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Permission.pm b/server/lib/NicToolServer/Permission.pm
index 8aaa6bc0..f6ac2c1a 100755
--- a/server/lib/NicToolServer/Permission.pm
+++ b/server/lib/NicToolServer/Permission.pm
@@ -699,7 +699,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -709,7 +709,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Response.pm b/server/lib/NicToolServer/Response.pm
index d25449d4..0c3a1873 100644
--- a/server/lib/NicToolServer/Response.pm
+++ b/server/lib/NicToolServer/Response.pm
@@ -77,7 +77,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -87,7 +87,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/SOAP.pm b/server/lib/NicToolServer/SOAP.pm
index 4cb31ff3..0aecb77d 100644
--- a/server/lib/NicToolServer/SOAP.pm
+++ b/server/lib/NicToolServer/SOAP.pm
@@ -106,7 +106,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -116,7 +116,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Session.pm b/server/lib/NicToolServer/Session.pm
index 9a3a6e83..45c5a7cc 100644
--- a/server/lib/NicToolServer/Session.pm
+++ b/server/lib/NicToolServer/Session.pm
@@ -404,7 +404,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -414,7 +414,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/User.pm b/server/lib/NicToolServer/User.pm
index a48487f0..ceaabb2c 100644
--- a/server/lib/NicToolServer/User.pm
+++ b/server/lib/NicToolServer/User.pm
@@ -879,7 +879,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -889,7 +889,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/User/Sanity.pm b/server/lib/NicToolServer/User/Sanity.pm
index 533d4f14..c3a8bbf8 100644
--- a/server/lib/NicToolServer/User/Sanity.pm
+++ b/server/lib/NicToolServer/User/Sanity.pm
@@ -242,7 +242,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -252,7 +252,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Zone.pm b/server/lib/NicToolServer/Zone.pm
index d6aa2cf8..60ddb7c6 100644
--- a/server/lib/NicToolServer/Zone.pm
+++ b/server/lib/NicToolServer/Zone.pm
@@ -1114,7 +1114,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -1124,7 +1124,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Zone/Record.pm b/server/lib/NicToolServer/Zone/Record.pm
index 52da85d7..982a2d8b 100644
--- a/server/lib/NicToolServer/Zone/Record.pm
+++ b/server/lib/NicToolServer/Zone/Record.pm
@@ -445,7 +445,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -455,7 +455,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Zone/Record/Sanity.pm b/server/lib/NicToolServer/Zone/Record/Sanity.pm
index 9fd90aab..4e4f77dd 100644
--- a/server/lib/NicToolServer/Zone/Record/Sanity.pm
+++ b/server/lib/NicToolServer/Zone/Record/Sanity.pm
@@ -773,7 +773,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -783,7 +783,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/lib/NicToolServer/Zone/Sanity.pm b/server/lib/NicToolServer/Zone/Sanity.pm
index 92a46574..71ca42e7 100755
--- a/server/lib/NicToolServer/Zone/Sanity.pm
+++ b/server/lib/NicToolServer/Zone/Sanity.pm
@@ -255,7 +255,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -265,7 +265,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2017 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/sql/02_nt_user.sql b/server/sql/02_nt_user.sql
index e3a9327f..3c5d8516 100644
--- a/server/sql/02_nt_user.sql
+++ b/server/sql/02_nt_user.sql
@@ -1,5 +1,5 @@
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under 
diff --git a/server/sql/08_nt_zone.sql b/server/sql/08_nt_zone.sql
index 2abc09f9..843053a4 100644
--- a/server/sql/08_nt_zone.sql
+++ b/server/sql/08_nt_zone.sql
@@ -1,5 +1,5 @@
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/sql/09_nt_zone_record.sql b/server/sql/09_nt_zone_record.sql
index 5a6ac3ca..7f9f21ab 100644
--- a/server/sql/09_nt_zone_record.sql
+++ b/server/sql/09_nt_zone_record.sql
@@ -1,5 +1,5 @@
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/sql/10_nt_perm.sql b/server/sql/10_nt_perm.sql
index aa96219e..01434189 100644
--- a/server/sql/10_nt_perm.sql
+++ b/server/sql/10_nt_perm.sql
@@ -1,5 +1,5 @@
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/sql/90_nt_summary.sql b/server/sql/90_nt_summary.sql
index 8164b711..960a3bb6 100644
--- a/server/sql/90_nt_summary.sql
+++ b/server/sql/90_nt_summary.sql
@@ -1,5 +1,5 @@
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/sql/create_tables.pl b/server/sql/create_tables.pl
index ebcbf12a..86ecf354 100755
--- a/server/sql/create_tables.pl
+++ b/server/sql/create_tables.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01+ Copyright 2004-2008 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/t/01_data.t b/server/t/01_data.t
index eb77de90..bb953a22 100644
--- a/server/t/01_data.t
+++ b/server/t/01_data.t
@@ -1,4 +1,4 @@
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01+ Copyright 2011 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/t/02_basic.t b/server/t/02_basic.t
index cf55b80c..482551fa 100644
--- a/server/t/02_basic.t
+++ b/server/t/02_basic.t
@@ -1,6 +1,6 @@
 # ABSTRACT: basic NicTool API login tests
 
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/t/04_groups.t b/server/t/04_groups.t
index d0565a7c..5a7d2ffc 100644
--- a/server/t/04_groups.t
+++ b/server/t/04_groups.t
@@ -1,4 +1,4 @@
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/t/06_users.t b/server/t/06_users.t
index c9c589cd..93158522 100644
--- a/server/t/06_users.t
+++ b/server/t/06_users.t
@@ -1,4 +1,4 @@
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/t/08_nameservers.t b/server/t/08_nameservers.t
index 04cc1a51..b1a6bbbe 100644
--- a/server/t/08_nameservers.t
+++ b/server/t/08_nameservers.t
@@ -1,4 +1,4 @@
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/t/10_zones.t b/server/t/10_zones.t
index 2815ad6a..d49bc9f3 100644
--- a/server/t/10_zones.t
+++ b/server/t/10_zones.t
@@ -1,4 +1,4 @@
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/t/12_records.t b/server/t/12_records.t
index b1619fc2..5ff76c06 100644
--- a/server/t/12_records.t
+++ b/server/t/12_records.t
@@ -1,4 +1,4 @@
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/t/NicToolTest.pm b/server/t/NicToolTest.pm
index fd1fd45c..39e1b245 100644
--- a/server/t/NicToolTest.pm
+++ b/server/t/NicToolTest.pm
@@ -175,7 +175,7 @@ Damon Edwards
 
 =item *
 
-Abe Shelton
+Abraham Ingersoll
 
 =item *
 
@@ -185,7 +185,7 @@ Greg Schueler
 
 =head1 COPYRIGHT AND LICENSE
 
-This software is Copyright (c) 2011 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abe Shelton, Greg Schueler.
+This software is Copyright (c) 2011 by The Network People, Inc. This software is Copyright (c) 2001 by Damon Edwards, Abraham Ingersoll, Greg Schueler.
 
 This is free software, licensed under:
 
diff --git a/server/xt/14_permissions.t b/server/xt/14_permissions.t
index 8b9d0d3f..4500ddb9 100644
--- a/server/xt/14_permissions.t
+++ b/server/xt/14_permissions.t
@@ -1,4 +1,4 @@
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/xt/16_delegation.t b/server/xt/16_delegation.t
index 8dda9532..bd60d6f8 100644
--- a/server/xt/16_delegation.t
+++ b/server/xt/16_delegation.t
@@ -1,4 +1,4 @@
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/xt/18_interaction.t b/server/xt/18_interaction.t
index 66a23a4e..41890992 100644
--- a/server/xt/18_interaction.t
+++ b/server/xt/18_interaction.t
@@ -1,4 +1,4 @@
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under
diff --git a/server/xt/20_permission.t b/server/xt/20_permission.t
index 9eda51a0..b3667595 100644
--- a/server/xt/20_permission.t
+++ b/server/xt/20_permission.t
@@ -1,4 +1,4 @@
-# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abe Shelton & Greg Schueler
+# NicTool v2.00-rc1 Copyright 2001 Damon Edwards, Abraham Ingersoll & Greg Schueler
 # NicTool v2.01 Copyright 2004 The Network People, Inc.
 #
 # NicTool is free software; you can redistribute it and/or modify it under