diff --git a/.cookiecutter.json b/.cookiecutter.json
new file mode 100644
index 00000000..20093dd4
--- /dev/null
+++ b/.cookiecutter.json
@@ -0,0 +1,29 @@
+{
+    "cookiecutter": {
+        "codeowner_github_usernames": "@itdependsnetworks @jeffkala @qduk",
+        "full_name": "Network to Code, LLC",
+        "email": "info@networktocode.com",
+        "github_org": "networktocode",
+        "description": "\"Common helper functions useful in network automation.\"",
+        "project_name": "netutils",
+        "project_slug": "netutils",
+        "repo_url": "https://github.com/networktocode/netutils",
+        "base_url": "netutils",
+        "project_python_name": "netutils",
+        "project_python_base_version": "3.8",
+        "project_with_config_settings": "no",
+        "generate_docs": "yes",
+        "version": "1.15.1",
+        "_drift_manager": {
+            "template": "https://github.com/networktocode-llc/cookiecutter-ntc.git",
+            "template_dir": "python",
+            "template_ref": "jlk-more-python",
+            "cookie_dir": "",
+            "branch_prefix": "drift-manager",
+            "pull_request_strategy": "create",
+            "post_actions": [],
+            "draft": false,
+            "baked_commit_ref": "36ad55b634a46615d22d393aef2d46fa383d1f93"
+        }
+    }
+}
diff --git a/.dockerignore b/.dockerignore
index e4b30e20..932ca8e2 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 **/*.pyc
 **/*.pyo
 **/*.log
@@ -7,4 +8,33 @@ Dockerfile
 docker-compose.yml
 .env
 docs/_build
-**/__pycache__
\ No newline at end of file
+**/__pycache__
+=======
+# Docker related
+development/Dockerfile
+development/docker-compose*.yml
+development/*.env
+*.env
+environments/
+
+# Python
+**/*.pyc
+**/*.pyo
+**/__pycache__/
+**/.pytest_cache/
+**/.venv/
+
+
+# Other
+docs/_build
+FAQ.md
+.git/
+.gitignore
+.github
+tasks.py
+LICENSE
+**/*.log
+**/.vscode/
+invoke*.yml
+tasks.py
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 491431e0..7b40291a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,8 +4,13 @@ about: Report a reproducible bug in the current release of netutils
 ---
 
 ### Environment
+<<<<<<< HEAD
 * Python version:  <!-- Example: 3.8.5 -->
 * netutils version:  <!-- Example: 1.14.0 -->
+=======
+* Python version:  <!-- Example: 3.9 -->
+* netutils version:  <!-- Example: 1.0.0 -->
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 <!-- What did you expect to happen? -->
 ### Expected Behavior
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 67ee840b..52f6c032 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -5,7 +5,11 @@ about: Propose a new feature or enhancement
 ---
 
 ### Environment
+<<<<<<< HEAD
 * netutils version:  <!-- Example: 1.14.0 -->
+=======
+* netutils version:  <!-- Example: 1.0.0 -->
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 <!--
     Describe in detail the new functionality you are proposing.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bceb65f9..c581435f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,9 +1,16 @@
 ---
 name: "CI"
+<<<<<<< HEAD
 concurrency:  # Cancel any existing runs of this workflow for this same PR
   group: "${{ github.workflow }}-${{ github.ref }}"
   cancel-in-progress: true
 on:  # yamllint disable-line rule:truthy rule:comments
+=======
+concurrency: # Cancel any existing runs of this workflow for this same PR
+  group: "${{ '{{ github.workflow }}' }}-${{ '{{ github.ref }}' }}"
+  cancel-in-progress: true
+on: # yamllint disable-line rule:truthy rule:comments
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
   push:
     branches:
       - "main"
@@ -18,7 +25,11 @@ env:
 
 jobs:
   ruff-format:
+<<<<<<< HEAD
     runs-on: "ubuntu-24.04"
+=======
+    runs-on: "ubuntu-latest"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     env:
       INVOKE_NETUTILS_LOCAL: "True"
     steps:
@@ -27,11 +38,19 @@ jobs:
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
+<<<<<<< HEAD
           poetry-version: "1.8.5"
       - name: "Linting: ruff format"
         run: "poetry run invoke ruff --action format"
   ruff-lint:
     runs-on: "ubuntu-24.04"
+=======
+          poetry-version: "2.1.3"
+      - name: "Linting: ruff format"
+        run: "poetry run invoke ruff --action format"
+  ruff-lint:
+    runs-on: "ubuntu-latest"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     env:
       INVOKE_NETUTILS_LOCAL: "True"
     steps:
@@ -40,6 +59,7 @@ jobs:
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
+<<<<<<< HEAD
           poetry-version: "1.8.5"
       - name: "Linting: ruff"
         run: "poetry run invoke ruff --action lint"
@@ -61,6 +81,13 @@ jobs:
       - "ruff-lint"
   check-docs-build:
     runs-on: "ubuntu-24.04"
+=======
+          poetry-version: "2.1.3"
+      - name: "Linting: ruff"
+        run: "poetry run invoke ruff --action lint"
+  check-docs-build:
+    runs-on: "ubuntu-latest"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     env:
       INVOKE_NETUTILS_LOCAL: "True"
     steps:
@@ -69,11 +96,20 @@ jobs:
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
+<<<<<<< HEAD
           poetry-version: "1.8.5"
       - name: "Check Docs Build"
         run: "poetry run invoke build-and-check-docs"
   poetry:
     runs-on: "ubuntu-24.04"
+=======
+          poetry-version: "2.1.3"
+          poetry-install-options: "--only dev,docs"
+      - name: "Check Docs Build"
+        run: "poetry run invoke build-and-check-docs"
+  poetry:
+    runs-on: "ubuntu-latest"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     env:
       INVOKE_NETUTILS_LOCAL: "True"
     steps:
@@ -82,6 +118,7 @@ jobs:
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
+<<<<<<< HEAD
           poetry-version: "1.8.5"
       - name: "Checking: poetry lock file"
         run: "poetry lock --check"
@@ -92,6 +129,17 @@ jobs:
       - "yamllint"
   yamllint:
     runs-on: "ubuntu-24.04"
+=======
+          poetry-version: "2.1.3"
+      - name: "Checking: poetry lock file"
+        run: "poetry run invoke lock --check"
+    needs:
+      - "ruff-format"
+      - "ruff-lint"
+      - "yamllint"
+  yamllint:
+    runs-on: "ubuntu-latest"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     env:
       INVOKE_NETUTILS_LOCAL: "True"
     steps:
@@ -100,18 +148,30 @@ jobs:
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
+<<<<<<< HEAD
           poetry-version: "1.8.5"
+=======
+          poetry-version: "2.1.3"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
       - name: "Linting: yamllint"
         run: "poetry run invoke yamllint"
     needs:
       - "ruff-format"
       - "ruff-lint"
   pylint:
+<<<<<<< HEAD
     runs-on: "ubuntu-24.04"
     strategy:
       fail-fast: true
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+=======
+    runs-on: "ubuntu-latest"
+    strategy:
+      fail-fast: true
+      matrix:
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     env:
       PYTHON_VER: "${{ matrix.python-version }}"
     steps:
@@ -120,6 +180,7 @@ jobs:
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
+<<<<<<< HEAD
           poetry-version: "1.8.5"
       - name: "Get image version"
         run: "echo INVOKE_NETUTILS_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
@@ -128,6 +189,16 @@ jobs:
         uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2"  # v3.10.0
       - name: "Build"
         uses: "docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25"  # v5.4.0
+=======
+          poetry-version: "2.1.3"
+      - name: "Get image version"
+        run: "echo INVOKE_NETUTILS_IMAGE_VER=`poetry version -s`-py$${{ matrix.python-version }} >> $GITHUB_ENV"
+      - name: "Set up Docker Buildx"
+        id: "buildx"
+        uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0
+      - name: "Build"
+        uses: "docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25" # v5.4.0
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
         with:
           builder: "${{ steps.buildx.outputs.name }}"
           context: "./"
@@ -139,8 +210,11 @@ jobs:
           cache-to: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}"
           build-args: |
             PYTHON_VER=${{ env.PYTHON_VER }}
+<<<<<<< HEAD
       - name: "Debug: Show docker images"
         run: "docker image ls"
+=======
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
       - name: "Linting: Pylint"
         run: "poetry run invoke pylint"
     needs:
@@ -149,8 +223,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
+<<<<<<< HEAD
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     runs-on: "ubuntu-24.04"
+=======
+        python-version: ["3.9", "3.10", "3.11", "3.12"]
+    runs-on: "ubuntu-latest"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     env:
       PYTHON_VER: "${{ matrix.python-version }}"
     steps:
@@ -159,14 +238,24 @@ jobs:
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
+<<<<<<< HEAD
           poetry-version: "1.8.5"
+=======
+          poetry-version: "2.1.3"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
       - name: "Get image version"
         run: "echo INVOKE_NETUTILS_IMAGE_VER=`poetry version -s`-py${{ matrix.python-version }} >> $GITHUB_ENV"
       - name: "Set up Docker Buildx"
         id: "buildx"
+<<<<<<< HEAD
         uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2"  # v3.10.0
       - name: "Build"
         uses: "docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25"  # v5.4.0
+=======
+        uses: "docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2" # v3.10.0
+      - name: "Build"
+        uses: "docker/build-push-action@ca052bb54ab0790a636c9b5f226502c73d547a25" # v5.4.0
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
         with:
           builder: "${{ steps.buildx.outputs.name }}"
           context: "./"
@@ -178,6 +267,7 @@ jobs:
           cache-to: "type=gha,scope=${{ env.INVOKE_NETUTILS_IMAGE_NAME }}-${{ env.INVOKE_NETUTILS_IMAGE_VER }}-py${{ matrix.python-version }}"
           build-args: |
             PYTHON_VER=${{ env.PYTHON_VER }}
+<<<<<<< HEAD
       - name: "Debug: Show docker images"
         run: "docker image ls"
       - name: "Run Tests"
@@ -187,6 +277,33 @@ jobs:
   publish_gh:
     name: "Publish to GitHub"
     runs-on: "ubuntu-24.04"
+=======
+      - name: "Run Tests"
+        run: "poetry run invoke pytest"
+    needs:
+      - "poetry"
+  changelog:
+    if: >
+      contains(fromJson('["develop"]'), github.base_ref) &&
+      (github.head_ref != 'main') && (!startsWith(github.head_ref, 'release'))
+    runs-on: "ubuntu-22.04"
+    steps:
+      - name: "Check out repository code"
+        uses: "actions/checkout@v4"
+        with:
+          fetch-depth: "0"
+      - name: "Setup environment"
+        uses: "networktocode/gh-action-setup-poetry-environment@v6"
+        with:
+          poetry-version: "2.1.3"
+      - name: "Check for changelog entry"
+        run: |
+          git fetch --no-tags origin +refs/heads/${{ github.base_ref }}:refs/remotes/origin/${{ github.base_ref }}
+          poetry run towncrier check --compare-with origin/${{ github.base_ref }}
+  publish_gh:
+    name: "Publish to GitHub"
+    runs-on: "ubuntu-latest"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     # yamllint disable-line rule:quoted-strings
     if: startsWith(github.ref, 'refs/tags/v')
     env:
@@ -194,16 +311,30 @@ jobs:
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
+<<<<<<< HEAD
       - name: "Setup environment"
         uses: "networktocode/gh-action-setup-poetry-environment@v6"
         with:
           poetry-version: "1.8.5"
           python-version: "3.12"
           poetry-install-options: "--no-root"
+=======
+      - name: "Set up Python"
+        uses: "actions/setup-python@v5"
+        with:
+          python-version: "3.12"
+      - name: "Install Python Packages"
+        run: "pip install poetry"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
       - name: "Set env"
         run: "echo RELEASE_VERSION=${GITHUB_REF:10} >> $GITHUB_ENV"
       - name: "Run Poetry Version"
         run: "poetry version $RELEASE_VERSION"
+<<<<<<< HEAD
+=======
+      - name: "Build Documentation"
+        run: "poetry run invoke build-and-check-docs"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
       - name: "Run Poetry Build"
         run: "poetry build"
       - name: "Upload binaries to release"
@@ -214,25 +345,50 @@ jobs:
       - "pytest"
   publish_pypi:
     name: "Push Package to PyPI"
+<<<<<<< HEAD
     runs-on: "ubuntu-24.04"
     if: "startsWith(github.ref, 'refs/tags/v')"
+=======
+    runs-on: "ubuntu-latest"
+    # yamllint disable-line rule:quoted-strings
+    if: startsWith(github.ref, 'refs/tags/v')
+    env:
+      INVOKE_NETUTILS_LOCAL: "True"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     steps:
       - name: "Check out repository code"
         uses: "actions/checkout@v4"
       - name: "Set up Python"
+<<<<<<< HEAD
         uses: "actions/setup-python@v2"
         with:
           python-version: "3.13"
+=======
+        uses: "actions/setup-python@v5"
+        with:
+          python-version: "3.12"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
       - name: "Install Python Packages"
         run: "pip install poetry"
       - name: "Set env"
         run: "echo RELEASE_VERSION=${GITHUB_REF:10} >> $GITHUB_ENV"
       - name: "Run Poetry Version"
         run: "poetry version $RELEASE_VERSION"
+<<<<<<< HEAD
       - name: "Run Poetry Build"
         run: "poetry build"
       - name: "Push to PyPI"
         uses: "pypa/gh-action-pypi-publish@release/v1"
+=======
+      - name: "Install Dependencies (needed for mkdocs)"
+        run: "poetry install --no-root"
+      - name: "Build Documentation"
+        run: "poetry run invoke build-and-check-docs"
+      - name: "Run Poetry Build"
+        run: "poetry build"
+      - name: "Push to PyPI"
+        uses: "pypa/gh-action-pypi-publish@76f52bc884231f62b9a034ebfe128415bbaabdfc"  # v1.12.4
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
         with:
           user: "__token__"
           password: "${{ secrets.PYPI_API_TOKEN }}"
@@ -242,7 +398,11 @@ jobs:
     needs:
       - "publish_gh"
       - "publish_pypi"
+<<<<<<< HEAD
     runs-on: "ubuntu-24.04"
+=======
+    runs-on: "ubuntu-latest"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     env:
       SLACK_WEBHOOK_URL: "${{ secrets.SLACK_WEBHOOK_URL }}"
       SLACK_MESSAGE: >-
@@ -255,7 +415,11 @@ jobs:
         # ENVs cannot be used directly in job.if. This is a workaround to check
         # if SLACK_WEBHOOK_URL is present.
         if: "env.SLACK_WEBHOOK_URL != ''"
+<<<<<<< HEAD
         uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3"  # v1.27.1
+=======
+        uses: "slackapi/slack-github-action@fcfb566f8b0aab22203f066d80ca1d7e4b5d05b3" # v1.27.1
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
         with:
           payload: |
             {
diff --git a/.gitignore b/.gitignore
index 68137b43..6a9f6c4b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,11 +192,55 @@ $RECYCLE.BIN/
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+<<<<<<< HEAD
 .idea/
+=======
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 # CMake
 cmake-build-*/
 
+<<<<<<< HEAD
+=======
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 # File-based project format
 *.iws
 
@@ -209,12 +253,74 @@ out/
 # JIRA plugin
 atlassian-ide-plugin.xml
 
+<<<<<<< HEAD
+=======
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
 
+<<<<<<< HEAD
 ### vscode ###
 .vscode/*
 *.code-workspace
+=======
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### PyCharm Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+# https://plugins.jetbrains.com/plugin/7973-sonarlint
+.idea/**/sonarlint/
+
+# SonarQube Plugin
+# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
+.idea/**/sonarIssues.xml
+
+# Markdown Navigator plugin
+# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
+.idea/**/markdown-navigator.xml
+.idea/**/markdown-navigator-enh.xml
+.idea/**/markdown-navigator/
+
+# Cache file creation bug
+# See https://youtrack.jetbrains.com/issue/JBR-2257
+.idea/$CACHE_FILE$
+
+# CodeStream plugin
+# https://plugins.jetbrains.com/plugin/12206-codestream
+.idea/codestream.xml
+
+### vscode ###
+.vscode/*
+*.code-workspace
+
+# Rando
+creds.env
+development/*.txt
+
+# Invoke overrides
+invoke.yml
+
+# Docs
+docs/README.md
+docs/CHANGELOG.md
+public
+/compose.yaml
+/dump.sql
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/.readthedocs.yml b/.readthedocs.yml
index b60d928e..fffd38f7 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -6,6 +6,7 @@
 # Required
 version: 2
 
+<<<<<<< HEAD
 # Set the version of Python in the build environment.
 build:
   os: "ubuntu-22.04"
@@ -22,3 +23,24 @@ python:
     - requirements: "docs/requirements.txt"
     - method: "pip"
       path: "."
+=======
+# Setup the build environment.
+build:
+  os: "ubuntu-lts-latest"
+  tools:
+    python: "3.12"
+  jobs:
+    post_install:
+      # Install poetry
+      # https://python-poetry.org/docs/#installing-manually
+      - "pip install poetry"
+      # Install dependencies 'docs' dependency group
+      # https://python-poetry.org/docs/managing-dependencies/#dependency-groups
+      # VIRTUAL_ENV needs to be set manually for now.
+      # See https://github.com/readthedocs/readthedocs.org/pull/11152/
+      - "VIRTUAL_ENV=$READTHEDOCS_VIRTUALENV_PATH poetry install --only docs"
+
+mkdocs:
+  configuration: "mkdocs.yml"
+  fail_on_warning: true
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/Dockerfile b/Dockerfile
index cb1757c2..639ed020 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 ARG PYTHON_VER=3.11
+=======
+ARG PYTHON_VER="3.8"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 FROM python:${PYTHON_VER}-slim
 
@@ -23,4 +27,8 @@ WORKDIR /local
 COPY . /local
 
 # Install the app
+<<<<<<< HEAD
 RUN poetry install --with dev
+=======
+RUN poetry install --with dev --all-extras
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/LICENSE b/LICENSE
index dcfeb843..f8d4ac0b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,10 @@
 Apache Software License 2.0
 
+<<<<<<< HEAD
 Copyright (c) 2021, Network to Code, LLC
+=======
+Copyright (c) 2025, Network to Code, LLC
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -12,4 +16,8 @@ Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+<<<<<<< HEAD
+limitations under the License.
+=======
+limitations under the License.
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/README.md b/README.md
index 969516fe..9b23e3a4 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # Netutils
 
 <p align="center">
@@ -35,3 +36,54 @@ Any PRs with fixes or improvements are very welcome!
 ## Questions
 
 For any questions or comments, please check the [FAQ](https://netutils.readthedocs.io/en/latest/user/faq/) first. Feel free to also swing by the [Network to Code Slack](https://networktocode.slack.com/) (channel `#networktocode`), sign up [here](http://slack.networktocode.com/) if you don't have an account.
+=======
+# netutils
+
+## Documentation
+
+The documentation of each repo and its APIs can be found in the [netutils Page](https://https://networktocode-llc.github.io/netutils). It is created and published by Github actions every time you cut a new release, as long as all tests are passing. The action name is `pages` and can be found in `.github/workflows/ci.yml`.
+
+### Requirements
+
+If you want to build the documentation on a GitHub page:
+
+1. Ensure that all tests are passing.
+
+2. Follow the release and tagging process.
+
+3. Go to the repository "Settings", then go to "Pages", and select the source branch: `ntc-pages`.
+
+---
+**NOTE**
+
+The page url uses the repository name to formulate the url: `https://https://networktocode-llc.github.io/{ repo_name }`. For consistency, we recommend that the repository name should be the same as the project slug from the cookie cutter template: `https://https://networktocode-llc.github.io/netutils`
+
+---
+
+
+### Local Doc Build
+
+If you want to build the documentation locally, follow these steps:
+
+1. Run poetry to install all necessary packages: 
+
+```bash
+$ poetry install
+$ poetry shell
+```
+
+2. Create local docs:
+
+```bash
+$ sphinx-build -vvv -b html ./docs public
+``
+
+3. Run a local python server to check your documentation rendering:
+
+```bash
+cd public
+python -m http.server &
+```
+
+
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/changes/+jlk-more-python.housekeeping b/changes/+jlk-more-python.housekeeping
new file mode 100644
index 00000000..480c1aa7
--- /dev/null
+++ b/changes/+jlk-more-python.housekeeping
@@ -0,0 +1 @@
+Rebaked from the cookie `jlk-more-python`.
diff --git a/changes/.gitignore b/changes/.gitignore
index b722e9e1..40a2b898 100644
--- a/changes/.gitignore
+++ b/changes/.gitignore
@@ -1 +1,5 @@
-!.gitignore
\ No newline at end of file
+<<<<<<< HEAD
+!.gitignore
+=======
+!.gitignore
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/changes/.gitkeep b/changes/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/docs/admin/install.md b/docs/admin/install.md
index 5a17140c..0cb8c2ed 100644
--- a/docs/admin/install.md
+++ b/docs/admin/install.md
@@ -3,6 +3,7 @@
 Option 1: Install from PyPI.
 
 ```bash
+<<<<<<< HEAD
 $ pip install netutils
 ```
 
@@ -10,11 +11,24 @@ Option 2: Install from PyPI with optional requirements.
 
 ```bash
 $ pip install netutils[napalm]
+=======
+pip install netutils
+```
+
+Option 2: Manually install via Poetry.
+
+```bash
+git clone https://github.com/networktocode/netutils.git
+cd netutils
+curl -sSL https://install.python-poetry.org | python3 -
+poetry install
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 ```
 
 Option 3: Install from a GitHub branch, such as develop as shown below.
 
 ```bash
+<<<<<<< HEAD
 $ pip install git+https://github.com/networktocode/netutils.git@develop
 ```
 
@@ -22,3 +36,7 @@ $ pip install git+https://github.com/networktocode/netutils.git@develop
 One of the requirements of this library is to avoid having dependencies; however, including a few optional dependencies in an opt in fashion allows `netutils` to remain lean while offering some powerful addons.
 
 Installing the optional dependencies is only needed when the user needs access to the functions using the dependencies. As an example `get_napalm_getters()` which will provide a mapping of available NAPALM getters based on currently installed NAPALM libraries, if NAPALM is not installed the function simply raises an exception and warns the user that the library is not installed.
+=======
+pip install git+https://github.com/networktocode/netutils.git@develop
+```
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/docs/admin/release_notes/version_1.0.md b/docs/admin/release_notes/version_1.0.md
index b549f075..c3482fee 100644
--- a/docs/admin/release_notes/version_1.0.md
+++ b/docs/admin/release_notes/version_1.0.md
@@ -1,5 +1,6 @@
 # v1.0 Release Notes
 
+<<<<<<< HEAD
 ## Release Overview
 
 - Commit to SemVer
@@ -19,3 +20,51 @@
 
 - [#83](https://github.com/networktocode/netutils/issues/83) Remove support for old function 'is_fqdn_valid' as prep for 1.0.0.
 
+=======
+!!! warning "Developer Note - Remove Me!"
+    Guiding Principles:
+
+    - Changelogs are for humans, not machines.
+    - There should be an entry for every single version.
+    - The same types of changes should be grouped.
+    - Versions and sections should be linkable.
+    - The latest version comes first.
+    - The release date of each version is displayed.
+    - Mention whether you follow Semantic Versioning.
+
+    Types of changes:
+
+    - `Added` for new features.
+    - `Changed` for changes in existing functionality.
+    - `Deprecated` for soon-to-be removed features.
+    - `Removed` for now removed features.
+    - `Fixed` for any bug fixes.
+    - `Security` in case of vulnerabilities.
+
+
+This document describes all new features and changes in the release `1.0`. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## Release Overview
+
+- Major features or milestones
+- Achieved in this `x.y` release
+- Changes to compatibility with Nautobot and/or other apps, libraries etc.
+
+## [v1.0.1] - 2025-05-17
+
+### Added
+
+### Changed
+
+### Fixed
+
+- [#123](https://github.com/networktocode-llc/"netutils"/issues/123) Fixed Tag filtering not working in job launch form
+
+## [v1.0.0] - 2025-07-17
+
+### Added
+
+### Changed
+
+### Fixed
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/docs/admin/uninstall.md b/docs/admin/uninstall.md
index c6f249a5..6ea6dab1 100644
--- a/docs/admin/uninstall.md
+++ b/docs/admin/uninstall.md
@@ -3,5 +3,10 @@
 Uninstall from environment.
 
 ```bash
+<<<<<<< HEAD
 $ pip uninstall netutils
-```
\ No newline at end of file
+```
+=======
+pip uninstall netutils
+```
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/docs/admin/upgrade.md b/docs/admin/upgrade.md
index 6204d1fa..f1defd60 100644
--- a/docs/admin/upgrade.md
+++ b/docs/admin/upgrade.md
@@ -3,5 +3,10 @@
 Upgrade from PyPI.
 
 ```bash
+<<<<<<< HEAD
 $ pip install netutils --upgrade
-```
\ No newline at end of file
+```
+=======
+pip install netutils --upgrade
+```
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/docs/assets/overrides/partials/copyright.html b/docs/assets/overrides/partials/copyright.html
index b623894d..357a5a52 100644
--- a/docs/assets/overrides/partials/copyright.html
+++ b/docs/assets/overrides/partials/copyright.html
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 <div class="md-copyright">
     {% if config.copyright %}
     <div class="md-copyright__highlight">
diff --git a/docs/dev/arch_decision.md b/docs/dev/arch_decision.md
new file mode 100644
index 00000000..cbe4d49d
--- /dev/null
+++ b/docs/dev/arch_decision.md
@@ -0,0 +1,3 @@
+# Architecture Decision Records
+
+The intention is to document deviations from a standard pattern.
diff --git a/docs/dev/contributing.md b/docs/dev/contributing.md
index 19747ed3..6b99883f 100644
--- a/docs/dev/contributing.md
+++ b/docs/dev/contributing.md
@@ -2,14 +2,21 @@
 
 Pull requests are welcomed and automatically built and tested against multiple versions of Python through GitHub Actions. 
 
+<<<<<<< HEAD
 Except for unit tests, testing is only supported on Python 3.13.
 
 The project is packaged with a light development environment based on `Docker` to help with the local development of the project and to run tests within  GitHub Actions.
+=======
+Except for unit tests, testing is only supported on Python 3.9.
+
+The project is packaged with a light development environment based on `Docker` to help with the local development of the project and to run tests within GitHub Actions.
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 The project is following Network to Code software development guidelines and is leveraging the following:
 
 - Python linting and formatting: `pylint` and `ruff`.
 - YAML linting is done with `yamllint`.
+<<<<<<< HEAD
 - Typing is done with `mypy`.
 
 There are a number of things that are required in order to have a successful PR.
@@ -67,6 +74,39 @@ When adding to any of these features, you must run the `development_scripts` fro
 
 To add a new function to the jinja2 filter, add a new entry to the `_JINJA2_FUNCTION_MAPPINGS` located in the `utils.py` file. When adding an entry, the key corresponds with the name to call the function and the value to the path to find the function.
 
+=======
+
+Documentation is built using [mkdocs](https://www.mkdocs.org/). The [Docker based development environment](dev_environment.md#docker-development-environment) can be started by running `invoke docs` [http://localhost:8001](http://localhost:8001) that auto-refreshes when you make any changes to your local files.
+
+## Creating Changelog Fragments
+
+All pull requests to `next` or `develop` must include a changelog fragment file in the `./changes` directory. To create a fragment, use your GitHub issue number and fragment type as the filename. For example, `2362.added`. Valid fragment types are `added`, `changed`, `deprecated`, `fixed`, `removed`, and `security`. The change summary is added to the file in plain text. Change summaries should be complete sentences, starting with a capital letter and ending with a period, and be in past tense. Each line of the change fragment will generate a single change entry in the release notes. Use multiple lines in the same file if your change needs to generate multiple release notes in the same category. If the change needs to create multiple entries in separate categories, create multiple files.
+
+!!! example
+
+    **Wrong**
+    ```plaintext title="changes/1234.fixed"
+    fix critical bug in documentation
+    ```
+
+    **Right**
+    ```plaintext title="changes/1234.fixed"
+    Fixed critical bug in documentation.
+    ```
+
+!!! example "Multiple Entry Example"
+
+    This will generate 2 entries in the `fixed` category and one entry in the `changed` category.
+
+    ```plaintext title="changes/1234.fixed"
+    Fixed critical bug in documentation.
+    Fixed release notes generation.
+    ```
+
+    ```plaintext title="changes/1234.changed"
+    Changed release notes generation.
+    ```
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 ## Branching Policy
 
@@ -78,11 +118,19 @@ The branching policy includes the following tenets:
 - PRs intended to address bug fixes and security patches should be sourced from the develop branch.
 - PRs intended to add new features that break backward compatibility should be discussed before a PR is created.
 
+<<<<<<< HEAD
 Netutils will observe semantic versioning, as of 1.0. This may result in an quick turn around in minor versions to keep pace with an ever growing feature set.
 
 ## Release Policy
 
 Netutils has currently no intended scheduled release schedule, and will release new features in minor versions.
+=======
+netutils will observe semantic versioning, as of 1.0. This may result in an quick turn around in minor versions to keep pace with an ever growing feature set.
+
+## Release Policy
+
+netutils has currently no intended scheduled release schedule, and will release new features in minor versions.
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 When a new release is created the following should happen.
 
@@ -100,4 +148,8 @@ When a new release is created the following should happen.
 - A post release PR is created with.
     - Change the version from `<major>.<minor>.<patch>` to `<major>.<minor>.<patch + 1>-beta` pyproject.toml.
     - Set the PR to the `develop`.
-    - Once tests pass, merge.
\ No newline at end of file
+<<<<<<< HEAD
+    - Once tests pass, merge.
+=======
+    - Once tests pass, merge.
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/docs/dev/dev_environment.md b/docs/dev/dev_environment.md
index 95601912..64a46322 100644
--- a/docs/dev/dev_environment.md
+++ b/docs/dev/dev_environment.md
@@ -4,7 +4,11 @@
 
 The development environment can be used in two ways:
 
+<<<<<<< HEAD
 1. `Recommended` All services are spun up using Docker and a local mount so you can develop locally, but Netutils is spun up within the Docker container.
+=======
+1. `Recommended` All services are spun up using Docker and a local mount so you can develop locally, but netutils is spun up within the Docker container.
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 2. With a local poetry environment if you wish to develop outside of Docker.
 
 This is a quick reference guide if you're already familiar with the development environment provided, which you can read more about later in this document.
@@ -45,7 +49,11 @@ To either stop or destroy the development environment use the following options.
 
 ## Poetry
 
+<<<<<<< HEAD
 Poetry is used in lieu of the "virtualenv" commands and is leveraged in both environments. The virtual environment will provide all of the Python packages required to manage the development environment such as **Invoke**. See the [Local Development Environment](#full-docker-development-environment) section to see how to install Netutils if you're going to be developing locally (i.e. not using the Docker container).
+=======
+Poetry is used in lieu of the "virtualenv" commands and is leveraged in both environments. The virtual environment will provide all of the Python packages required to manage the development environment such as **Invoke**. See the [Local Development Environment](#full-docker-development-environment) section to see how to install netutils if you're going to be developing locally (i.e. not using the Docker container).
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 The `pyproject.toml` file outlines all of the relevant dependencies for the project:
 
@@ -91,9 +99,16 @@ Each command can be executed with `invoke <command>`. Each command also has its
 ```
   autoformat (a)    Run code autoformatting.
   pylint            Run pylint for the specified name and Python version.
+<<<<<<< HEAD
   mypy              Run mypy to validate typing-hints.
+=======
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
   ruff              Run ruff to perform code formatting and/or linting.
   pytest            Run pytest for the specified name and Python version.
   tests             Run all tests for the specified name and Python version.
   yamllint          Run yamllint to validate formatting adheres to NTC defined YAML standards.
+<<<<<<< HEAD
 ```
+=======
+```
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/docs/generate_code_reference_pages.py b/docs/generate_code_reference_pages.py
new file mode 100644
index 00000000..1047cb46
--- /dev/null
+++ b/docs/generate_code_reference_pages.py
@@ -0,0 +1,20 @@
+"""Generate code reference pages."""
+
+from pathlib import Path
+
+import mkdocs_gen_files
+
+for file_path in Path("netutils").rglob("*.py"):
+    module_path = file_path.with_suffix("")
+    doc_path = file_path.with_suffix(".md")
+    full_doc_path = Path("code-reference", doc_path)
+
+    parts = list(module_path.parts)
+    if parts[-1] == "__init__":
+        parts = parts[:-1]
+
+    with mkdocs_gen_files.open(full_doc_path, "w") as fd:
+        IDENTIFIER = ".".join(parts)
+        print(f"::: {IDENTIFIER}", file=fd)
+
+    mkdocs_gen_files.set_edit_path(full_doc_path, file_path)
diff --git a/docs/images/networktocode_logo.svg b/docs/images/networktocode_logo.svg
new file mode 100644
index 00000000..348e5241
--- /dev/null
+++ b/docs/images/networktocode_logo.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 792 102.64" style="enable-background:new 0 0 792 102.64;" xml:space="preserve">
+<style type="text/css">
+	.st0{filter:url(#Adobe_OpacityMaskFilter);}
+	.st1{fill:#FFFFFF;}
+	.st2{mask:url(#SVGID_1_);fill:url(#SVGID_2_);}
+	.st3{fill:#939598;}
+	.st4{fill:#FF8400;}
+</style>
+<defs>
+	<filter id="Adobe_OpacityMaskFilter" filterUnits="userSpaceOnUse" x="428.2" y="0" width="363.8" height="102.64">
+		
+			<feColorMatrix  type="matrix" values="-1 0 0 0 1  0 -1 0 0 1  0 0 -1 0 1  0 0 0 1 0" color-interpolation-filters="sRGB" result="source"/>
+		<feFlood  style="flood-color:white;flood-opacity:1" result="back"/>
+		<feBlend  in="source" in2="back" mode="normal"/>
+	</filter>
+</defs>
+<mask maskUnits="userSpaceOnUse" x="428.2" y="0" width="363.8" height="102.64" id="SVGID_1_">
+	<g class="st0">
+		<g>
+			<path class="st1" d="M451.79,63.11h1.25c1.29,0,2.4,0.46,3.32,1.37c0.92,0.91,1.38,2.01,1.38,3.3c0,1.34-0.47,2.46-1.4,3.36
+				c-0.93,0.9-2.03,1.35-3.3,1.35h-1.25c-1.29,0-2.4-0.46-3.32-1.37c-0.92-0.91-1.38-2.01-1.38-3.3c0-1.34,0.47-2.45,1.4-3.35
+				C449.42,63.56,450.52,63.11,451.79,63.11z"/>
+			<path class="st1" d="M480.43,41.5h15.77c0.69,0,1.19,0.14,1.49,0.41c0.3,0.28,0.45,0.63,0.45,1.07c0,0.41-0.15,0.76-0.45,1.04
+				c-0.3,0.28-0.79,0.41-1.49,0.41h-15.77v19.33c0,1.68,0.67,3.09,2.02,4.22c1.35,1.13,3.32,1.69,5.93,1.69
+				c1.96,0,4.08-0.29,6.36-0.88c2.28-0.59,4.06-1.25,5.33-1.99c0.46-0.3,0.84-0.45,1.14-0.45c0.37,0,0.69,0.14,0.97,0.43
+				c0.28,0.29,0.42,0.63,0.42,1.02c0,0.35-0.15,0.67-0.45,0.97c-0.74,0.76-2.53,1.59-5.38,2.47c-2.85,0.89-5.57,1.33-8.18,1.33
+				c-3.39,0-6.09-0.79-8.09-2.39c-2.01-1.59-3.01-3.73-3.01-6.43V44.44h-5.36c-0.69,0-1.19-0.14-1.49-0.41
+				c-0.3-0.28-0.45-0.63-0.45-1.07c0-0.41,0.15-0.76,0.45-1.04c0.3-0.28,0.8-0.41,1.49-0.41h5.36v-8.58c0-0.69,0.14-1.19,0.41-1.49
+				c0.28-0.3,0.62-0.45,1.04-0.45c0.44,0,0.8,0.15,1.07,0.45c0.28,0.3,0.41,0.79,0.41,1.49V41.5z"/>
+			<path class="st1" d="M543.71,56.54c0,4.43-1.59,8.21-4.75,11.34c-3.17,3.13-6.99,4.7-11.46,4.7c-4.52,0-8.36-1.57-11.51-4.72
+				c-3.16-3.15-4.74-6.92-4.74-11.32c0-4.43,1.58-8.21,4.74-11.36c3.16-3.15,7-4.72,11.51-4.72c4.47,0,8.29,1.57,11.46,4.7
+				C542.12,48.3,543.71,52.09,543.71,56.54z M540.77,56.54c0-3.64-1.3-6.74-3.89-9.3c-2.59-2.56-5.73-3.84-9.42-3.84
+				c-3.69,0-6.83,1.29-9.42,3.86s-3.89,5.67-3.89,9.28c0,3.6,1.3,6.68,3.89,9.27c2.59,2.58,5.73,3.87,9.42,3.87
+				c3.69,0,6.83-1.28,9.42-3.85C539.48,63.26,540.77,60.16,540.77,56.54z"/>
+			<path class="st1" d="M583.18,34.96v-2.04c0-0.69,0.13-1.19,0.4-1.49c0.27-0.3,0.62-0.45,1.06-0.45c0.44,0,0.79,0.15,1.06,0.45
+				c0.26,0.3,0.4,0.79,0.4,1.49v8.06c0,0.71-0.13,1.22-0.4,1.52c-0.27,0.3-0.62,0.45-1.06,0.45c-0.39,0-0.72-0.14-0.99-0.41
+				c-0.26-0.28-0.42-0.73-0.47-1.35c-0.12-1.94-1.16-3.65-3.15-5.15c-2.67-2.05-5.72-3.08-9.13-3.08c-2.24,0-4.35,0.5-6.33,1.49
+				c-1.48,0.72-2.65,1.59-3.53,2.63c-1.52,1.8-2.73,3.79-3.63,5.98c-0.65,1.61-0.97,3.43-0.97,5.46v5.08c0,4.33,1.57,8.1,4.7,11.29
+				c3.13,3.19,6.78,4.79,10.93,4.79c2.49,0,4.72-0.54,6.69-1.63c1.97-1.08,3.88-2.72,5.72-4.91c0.39-0.48,0.83-0.73,1.31-0.73
+				c0.42,0,0.75,0.13,1,0.38c0.25,0.25,0.38,0.58,0.38,0.97c0,0.53-0.5,1.34-1.49,2.42c-1.89,2.12-4.02,3.72-6.38,4.79
+				c-2.36,1.07-4.76,1.61-7.17,1.61c-2.1,0-4.23-0.4-6.4-1.21c-1.66-0.62-3.03-1.35-4.11-2.18c-1.08-0.83-2.42-2.23-3.99-4.2
+				c-1.58-1.97-2.66-3.79-3.23-5.46c-0.58-1.67-0.86-3.51-0.86-5.52v-5.91c0-2.86,0.77-5.78,2.3-8.77c1.53-2.98,3.63-5.28,6.29-6.88
+				c2.66-1.6,5.55-2.4,8.66-2.4C575.59,30.05,579.72,31.69,583.18,34.96z"/>
+			<path class="st1" d="M629.56,56.54c0,4.43-1.59,8.21-4.75,11.34c-3.17,3.13-6.99,4.7-11.46,4.7c-4.52,0-8.36-1.57-11.51-4.72
+				c-3.16-3.15-4.74-6.92-4.74-11.32c0-4.43,1.58-8.21,4.74-11.36c3.16-3.15,7-4.72,11.51-4.72c4.47,0,8.29,1.57,11.46,4.7
+				C627.97,48.3,629.56,52.09,629.56,56.54z M626.62,56.54c0-3.64-1.3-6.74-3.89-9.3c-2.59-2.56-5.73-3.84-9.42-3.84
+				c-3.69,0-6.83,1.29-9.42,3.86s-3.89,5.67-3.89,9.28c0,3.6,1.3,6.68,3.89,9.27c2.59,2.58,5.73,3.87,9.42,3.87
+				c3.69,0,6.83-1.28,9.42-3.85C625.32,63.26,626.62,60.16,626.62,56.54z"/>
+			<path class="st1" d="M670.47,28.05v40.49h3.87c0.72,0,1.22,0.13,1.52,0.4c0.3,0.26,0.45,0.62,0.45,1.05
+				c0,0.42-0.15,0.76-0.45,1.04c-0.3,0.28-0.81,0.42-1.52,0.42h-6.81v-5.77c-3.37,4.61-7.64,6.92-12.83,6.92
+				c-2.63,0-5.15-0.7-7.55-2.09c-2.41-1.39-4.31-3.38-5.71-5.96c-1.4-2.58-2.09-5.24-2.09-7.99c0-2.77,0.7-5.43,2.09-8.01
+				c1.39-2.57,3.3-4.56,5.71-5.96c2.41-1.41,4.94-2.11,7.59-2.11c5.07,0,9.34,2.31,12.79,6.92V30.99h-3.87
+				c-0.72,0-1.22-0.14-1.52-0.42c-0.3-0.28-0.45-0.63-0.45-1.07c0-0.42,0.15-0.76,0.45-1.04c0.3-0.28,0.81-0.42,1.52-0.42H670.47z
+				 M667.53,56.54c0-3.69-1.24-6.8-3.73-9.34c-2.49-2.54-5.45-3.8-8.89-3.8c-3.46,0-6.43,1.27-8.92,3.8
+				c-2.49,2.54-3.74,5.65-3.74,9.34c0,3.66,1.25,6.77,3.74,9.32c2.49,2.55,5.46,3.82,8.92,3.82c3.43,0,6.4-1.27,8.89-3.82
+				C666.29,63.32,667.53,60.21,667.53,56.54z"/>
+			<path class="st1" d="M714.89,57.17h-29.6c0.51,3.76,2.08,6.78,4.72,9.08c2.64,2.29,5.91,3.44,9.8,3.44
+				c2.17,0,4.44-0.36,6.81-1.07c2.37-0.72,4.31-1.66,5.81-2.84c0.44-0.34,0.82-0.52,1.14-0.52c0.37,0,0.69,0.14,0.97,0.43
+				c0.28,0.29,0.41,0.63,0.41,1.02c0,0.39-0.19,0.77-0.55,1.14c-1.11,1.15-3.07,2.23-5.9,3.23c-2.83,1-5.72,1.5-8.7,1.5
+				c-4.98,0-9.14-1.63-12.47-4.89c-3.33-3.26-5-7.21-5-11.84c0-4.22,1.56-7.84,4.69-10.86c3.12-3.02,6.99-4.53,11.6-4.53
+				c4.75,0,8.66,1.55,11.72,4.65S714.93,52.23,714.89,57.17z M711.95,54.23c-0.58-3.2-2.09-5.81-4.55-7.81
+				c-2.46-2.01-5.38-3.01-8.77-3.01c-3.39,0-6.31,0.99-8.75,2.97c-2.45,1.98-3.97,4.6-4.57,7.85H711.95z"/>
+			<path class="st1" d="M729.02,51.3c0-2.65,0.34-5.46,1.04-8.44c0.69-2.97,2.02-6.41,3.98-10.3c1.96-3.89,3.39-6.25,4.29-7.05
+				c0.28-0.25,0.58-0.38,0.9-0.38c0.42,0,0.77,0.14,1.06,0.42c0.29,0.28,0.43,0.61,0.43,1c0,0.23-0.08,0.48-0.24,0.76
+				c-2.54,4.66-4.35,8.88-5.43,12.66c-1.08,3.78-1.63,7.56-1.63,11.34c0,3.8,0.54,7.6,1.63,11.38c1.08,3.78,2.89,7.99,5.43,12.62
+				c0.16,0.28,0.24,0.53,0.24,0.76c0,0.39-0.14,0.73-0.43,1.02c-0.29,0.29-0.64,0.43-1.06,0.43c-0.32,0-0.62-0.13-0.9-0.38
+				c-0.85-0.78-2.25-3.08-4.18-6.88c-1.94-3.8-3.27-7.17-4.01-10.1C729.38,57.23,729.02,54.28,729.02,51.3z"/>
+			<path class="st1" d="M773.12,51.34c0,2.65-0.34,5.46-1.04,8.42c-0.69,2.96-2.02,6.4-3.98,10.3c-1.96,3.91-3.39,6.25-4.29,7.04
+				c-0.28,0.28-0.58,0.41-0.9,0.41c-0.42,0-0.77-0.14-1.06-0.43c-0.29-0.29-0.43-0.63-0.43-1.02c0-0.23,0.08-0.48,0.24-0.76
+				c2.54-4.63,4.34-8.84,5.43-12.62c1.08-3.78,1.63-7.56,1.63-11.34c0-3.8-0.54-7.6-1.63-11.38c-1.08-3.78-2.89-8-5.43-12.66
+				c-0.16-0.28-0.24-0.53-0.24-0.76c0-0.39,0.14-0.73,0.43-1c0.29-0.28,0.64-0.42,1.06-0.42c0.32,0,0.62,0.13,0.9,0.38
+				c0.85,0.78,2.25,3.08,4.18,6.88c1.94,3.8,3.27,7.17,4.01,10.1C772.75,45.41,773.12,48.37,773.12,51.34z"/>
+		</g>
+	</g>
+</mask>
+<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="610.0997" y1="101.1704" x2="610.0997" y2="-0.0878">
+	<stop  offset="0" style="stop-color:#0097FF"/>
+	<stop  offset="1" style="stop-color:#0A31E0"/>
+</linearGradient>
+<path class="st2" d="M779.78,0H440.42c-6.75,0-12.22,5.47-12.22,12.22v78.2c0,6.75,5.47,12.22,12.22,12.22h339.35
+	c6.75,0,12.22-5.47,12.22-12.22v-78.2C792,5.47,786.53,0,779.78,0z"/>
+<g>
+	<g>
+		<path class="st3" d="M129.64,41.5v4.39c2.03-2.05,3.86-3.47,5.5-4.25c1.64-0.78,3.48-1.17,5.53-1.17c2.21,0,4.23,0.47,6.05,1.42
+			c1.29,0.69,2.46,1.84,3.51,3.44c1.05,1.6,1.57,3.24,1.57,4.93v18.29h2.45c0.69,0,1.19,0.13,1.49,0.4c0.3,0.26,0.45,0.62,0.45,1.05
+			c0,0.42-0.15,0.76-0.45,1.04c-0.3,0.28-0.8,0.42-1.49,0.42h-7.78c-0.71,0-1.22-0.14-1.52-0.42c-0.3-0.28-0.45-0.62-0.45-1.04
+			c0-0.44,0.15-0.79,0.45-1.05c0.3-0.27,0.81-0.4,1.52-0.4h2.42V50.73c0-2.05-0.75-3.79-2.25-5.2c-1.5-1.42-3.5-2.13-6.02-2.13
+			c-1.91,0-3.57,0.39-4.98,1.16c-1.41,0.77-3.41,2.69-6.02,5.76v18.22h3.29c0.69,0,1.19,0.13,1.49,0.4c0.3,0.26,0.45,0.62,0.45,1.05
+			c0,0.42-0.15,0.76-0.45,1.04c-0.3,0.28-0.79,0.42-1.49,0.42h-9.47c-0.69,0-1.19-0.14-1.49-0.42c-0.3-0.28-0.45-0.62-0.45-1.04
+			c0-0.44,0.15-0.79,0.45-1.05c0.3-0.27,0.79-0.4,1.49-0.4h3.29v-24.1h-2.45c-0.69,0-1.19-0.14-1.49-0.41
+			c-0.3-0.28-0.45-0.63-0.45-1.07c0-0.41,0.15-0.76,0.45-1.04c0.3-0.28,0.8-0.41,1.49-0.41H129.64z"/>
+		<path class="st3" d="M197.94,57.17h-29.6c0.51,3.76,2.08,6.78,4.72,9.08c2.64,2.29,5.91,3.44,9.8,3.44c2.17,0,4.44-0.36,6.81-1.07
+			c2.37-0.72,4.31-1.66,5.81-2.84c0.44-0.34,0.82-0.52,1.14-0.52c0.37,0,0.69,0.14,0.97,0.43c0.28,0.29,0.41,0.63,0.41,1.02
+			c0,0.39-0.18,0.77-0.55,1.14c-1.11,1.15-3.07,2.23-5.9,3.23c-2.82,1-5.72,1.5-8.7,1.5c-4.98,0-9.14-1.63-12.47-4.89
+			c-3.33-3.26-5-7.21-5-11.84c0-4.22,1.56-7.84,4.69-10.86c3.12-3.02,6.99-4.53,11.6-4.53c4.75,0,8.66,1.55,11.72,4.65
+			C196.47,48.22,197.98,52.23,197.94,57.17z M195,54.23c-0.58-3.2-2.09-5.81-4.55-7.81c-2.45-2.01-5.38-3.01-8.77-3.01
+			c-3.39,0-6.3,0.99-8.75,2.97c-2.44,1.98-3.97,4.6-4.56,7.85H195z"/>
+		<path class="st3" d="M217.26,41.5h15.77c0.69,0,1.19,0.14,1.49,0.41c0.3,0.28,0.45,0.63,0.45,1.07c0,0.41-0.15,0.76-0.45,1.04
+			c-0.3,0.28-0.8,0.41-1.49,0.41h-15.77v19.33c0,1.68,0.67,3.09,2.02,4.22c1.35,1.13,3.33,1.69,5.93,1.69
+			c1.96,0,4.08-0.29,6.36-0.88c2.28-0.59,4.06-1.25,5.33-1.99c0.46-0.3,0.84-0.45,1.14-0.45c0.37,0,0.69,0.14,0.97,0.43
+			c0.28,0.29,0.42,0.63,0.42,1.02c0,0.35-0.15,0.67-0.45,0.97c-0.74,0.76-2.53,1.59-5.38,2.47c-2.85,0.89-5.57,1.33-8.18,1.33
+			c-3.39,0-6.09-0.79-8.09-2.39c-2.01-1.59-3.01-3.73-3.01-6.43V44.44h-5.36c-0.69,0-1.19-0.14-1.49-0.41
+			c-0.3-0.28-0.45-0.63-0.45-1.07c0-0.41,0.15-0.76,0.45-1.04c0.3-0.28,0.79-0.41,1.49-0.41h5.36v-8.58c0-0.69,0.14-1.19,0.42-1.49
+			c0.28-0.3,0.62-0.45,1.04-0.45c0.44,0,0.79,0.15,1.07,0.45c0.28,0.3,0.41,0.79,0.41,1.49V41.5z"/>
+		<path class="st3" d="M276.25,71.45l-3.6,0.03l-6.4-18.67l-6.36,18.67l-3.6-0.03l-6.02-27.01h-1.42c-0.69,0-1.19-0.14-1.49-0.41
+			c-0.3-0.28-0.45-0.63-0.45-1.07c0-0.41,0.15-0.76,0.45-1.04c0.3-0.28,0.8-0.41,1.49-0.41h7.99c0.69,0,1.19,0.14,1.49,0.41
+			c0.3,0.28,0.45,0.63,0.45,1.07c0,0.41-0.15,0.76-0.45,1.04c-0.3,0.28-0.8,0.41-1.49,0.41h-3.7l5.15,23.03l6.19-18.4h3.46
+			l6.36,18.4l4.95-23.03h-3.67c-0.69,0-1.19-0.14-1.5-0.41c-0.31-0.28-0.47-0.63-0.47-1.07c0-0.41,0.15-0.76,0.45-1.04
+			c0.3-0.28,0.81-0.41,1.52-0.41h7.95c0.71,0,1.22,0.14,1.52,0.41c0.3,0.28,0.45,0.63,0.45,1.07c0,0.41-0.15,0.76-0.45,1.04
+			c-0.3,0.28-0.81,0.41-1.52,0.41h-1.38L276.25,71.45z"/>
+		<path class="st3" d="M325.78,56.54c0,4.43-1.59,8.21-4.75,11.34c-3.17,3.13-6.99,4.7-11.46,4.7c-4.52,0-8.36-1.57-11.51-4.72
+			c-3.16-3.15-4.74-6.92-4.74-11.32c0-4.43,1.58-8.21,4.74-11.36c3.16-3.15,7-4.72,11.51-4.72c4.47,0,8.29,1.57,11.46,4.7
+			C324.2,48.3,325.78,52.09,325.78,56.54z M322.84,56.54c0-3.64-1.3-6.74-3.89-9.3c-2.59-2.56-5.73-3.84-9.42-3.84
+			c-3.69,0-6.83,1.29-9.42,3.86c-2.59,2.57-3.89,5.67-3.89,9.28c0,3.6,1.3,6.68,3.89,9.27c2.59,2.58,5.74,3.87,9.42,3.87
+			c3.69,0,6.83-1.28,9.42-3.85C321.55,63.26,322.84,60.16,322.84,56.54z"/>
+		<path class="st3" d="M346.78,41.5v7.33c3.78-3.41,6.61-5.61,8.49-6.59c1.88-0.98,3.61-1.47,5.2-1.47c1.73,0,3.34,0.58,4.82,1.75
+			s2.23,2.05,2.23,2.64c0,0.44-0.14,0.8-0.43,1.09c-0.29,0.29-0.65,0.43-1.09,0.43c-0.23,0-0.43-0.04-0.59-0.12
+			c-0.16-0.08-0.46-0.34-0.9-0.78c-0.81-0.81-1.51-1.36-2.11-1.66c-0.6-0.3-1.19-0.45-1.76-0.45c-1.27,0-2.79,0.51-4.58,1.52
+			c-1.79,1.01-4.88,3.49-9.28,7.43v15.91h12.86c0.71,0,1.22,0.13,1.52,0.4c0.3,0.26,0.45,0.62,0.45,1.05c0,0.42-0.15,0.76-0.45,1.04
+			c-0.3,0.28-0.81,0.42-1.52,0.42h-22.79c-0.69,0-1.19-0.13-1.49-0.4c-0.3-0.26-0.45-0.61-0.45-1.02c0-0.39,0.14-0.72,0.43-0.99
+			c0.29-0.26,0.79-0.4,1.5-0.4h7.02V44.44h-5.36c-0.69,0-1.19-0.14-1.49-0.41c-0.3-0.28-0.45-0.63-0.45-1.07
+			c0-0.41,0.14-0.76,0.43-1.04c0.29-0.28,0.79-0.41,1.5-0.41H346.78z"/>
+		<path class="st3" d="M384.77,58.51v12.93h-6.81c-0.69,0-1.19-0.14-1.49-0.42c-0.3-0.28-0.45-0.62-0.45-1.04
+			c0-0.44,0.15-0.79,0.45-1.05c0.3-0.27,0.8-0.4,1.49-0.4h3.91V30.99h-3.91c-0.69,0-1.19-0.14-1.49-0.42
+			c-0.3-0.28-0.45-0.63-0.45-1.07c0-0.42,0.15-0.76,0.45-1.04c0.3-0.28,0.8-0.42,1.49-0.42h6.81v26.76l12.35-10.37h-1.49
+			c-0.69,0-1.19-0.14-1.49-0.41c-0.3-0.28-0.45-0.62-0.45-1.04c0-0.44,0.15-0.8,0.45-1.07c0.3-0.28,0.8-0.41,1.49-0.41h9.3
+			c0.71,0,1.22,0.14,1.52,0.41c0.3,0.28,0.45,0.63,0.45,1.07c0,0.41-0.15,0.76-0.45,1.04c-0.3,0.28-0.81,0.41-1.52,0.41h-3.36
+			l-11.34,9.47l14.35,14.63h3.35c0.72,0,1.22,0.13,1.52,0.4c0.3,0.26,0.45,0.62,0.45,1.05c0,0.42-0.15,0.76-0.45,1.04
+			c-0.3,0.28-0.81,0.42-1.52,0.42h-9.41c-0.69,0-1.19-0.14-1.49-0.42c-0.3-0.28-0.45-0.62-0.45-1.04c0-0.44,0.15-0.79,0.45-1.05
+			c0.3-0.27,0.8-0.4,1.49-0.4h2.04l-12.48-12.83L384.77,58.51z"/>
+	</g>
+	<g>
+		<g>
+			<path class="st4" d="M67.17,77.5c-0.57,0-1.13-0.29-1.44-0.82c-0.47-0.8-0.2-1.82,0.59-2.29l30.3-17.85l-30.3-17.86
+				c-0.8-0.47-1.06-1.5-0.59-2.29c0.47-0.8,1.5-1.06,2.29-0.59l35.2,20.74l-35.2,20.74C67.76,77.43,67.46,77.5,67.17,77.5z"/>
+		</g>
+		<g>
+			<path class="st4" d="M34.43,77.5c-0.57,0-1.13-0.29-1.44-0.82c-0.47-0.8-0.2-1.82,0.59-2.29l30.3-17.85l-30.3-17.86
+				c-0.8-0.47-1.06-1.5-0.59-2.29c0.47-0.8,1.49-1.06,2.29-0.59l35.2,20.74l-35.2,20.74C35.01,77.43,34.72,77.5,34.43,77.5z"/>
+		</g>
+		<g>
+			<path class="st4" d="M1.68,77.5c-0.57,0-1.13-0.29-1.44-0.82c-0.47-0.8-0.2-1.82,0.59-2.29l30.3-17.85L0.82,38.67
+				c-0.8-0.47-1.06-1.5-0.59-2.29c0.47-0.8,1.49-1.06,2.29-0.59l35.2,20.74L2.53,77.27C2.26,77.43,1.97,77.5,1.68,77.5z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/docs/user/faq.md b/docs/user/faq.md
index 60335a5b..867715b8 100644
--- a/docs/user/faq.md
+++ b/docs/user/faq.md
@@ -1,4 +1,5 @@
 # Frequently Asked Questions
+<<<<<<< HEAD
 
 ## Which OS Config types have Parsers?
 
@@ -14,3 +15,5 @@ The documentation is always provided in the function for [code docs](../dev/code
 One of the requirements of this library is to avoid having dependencies; however, including a few optional dependencies in an opt in fashion allows `netutils` to remain lean while offering some powerful addons.
 
 Installing the optional dependencies is only needed when the user needs access to the functions using the dependencies. If the dependency is not installed the function simply raises an exception and warns the user that the library is not installed.
+=======
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/docs/user/lib_getting_started.md b/docs/user/lib_getting_started.md
index d6dba101..c6711545 100644
--- a/docs/user/lib_getting_started.md
+++ b/docs/user/lib_getting_started.md
@@ -1,7 +1,27 @@
 # Getting Started with the Library
 
+<<<<<<< HEAD
 The library's primary use case is providing Python functions for the community. The primary way to use it is the same as any Python library. You `import` the functions, and use them, there are many examples on the [Use Cases](./lib_use_cases.md) page.
 
 ## Install the Library
 
-To install the library, please follow the instructions detailed in the [Installation Guide](../admin/install.md).
\ No newline at end of file
+To install the library, please follow the instructions detailed in the [Installation Guide](../admin/install.md).
+=======
+This document provides a step-by-step tutorial on how to get the library going and how to use it.
+
+## Install the Library
+
+To install the library, please follow the instructions detailed in the [Installation Guide](../admin/install.md).
+
+## First steps with the Library
+
+!!! warning "Developer Note - Remove Me!"
+    What (with screenshots preferably) does it look like to perform the simplest workflow within the library once installed?
+
+## What are the next steps?
+
+!!! warning "Developer Note - Remove Me!"
+    After taking the first steps, what else could the users look at doing.
+
+You can check out the [Use Cases](./lib_use_cases.md) section for more examples.
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/docs/user/lib_overview.md b/docs/user/lib_overview.md
index b72193a0..b29caf86 100644
--- a/docs/user/lib_overview.md
+++ b/docs/user/lib_overview.md
@@ -1,5 +1,6 @@
 # Library Overview
 
+<<<<<<< HEAD
 A Python library that is a collection of functions for common network automation tasks.
 
 This library intends to keep the following tenets:
@@ -15,10 +16,16 @@ This library intends to keep the following tenets:
 ## Description/Overview
 
 A Python library that is a collection of functions that are used in the common network automation tasks. Tasks such as converting a BGP ASN to and from dotted format, normalizing an interface name, or "type 5" encrypting a password. The intention is to centralize these functions while keeping the library light.
+=======
+This document provides an overview of the library including critical information and important considerations.
+
+## Description
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 
 ## Audience (User Personas) - Who should use this Library?
 
+<<<<<<< HEAD
 The intended audience is those who are programming network automation tasks with Python. Whether you are a seasoned veteran or a casual scripter, this library should help to reduce duplication between various reinventing the wheel.
 
 ## Authors and Maintainers
@@ -26,3 +33,12 @@ The intended audience is those who are programming network automation tasks with
 - @itdependsnetworks
 - @jeffkala
 - @qduk
+=======
+!!! warning "Developer Note - Remove Me!"
+    Who is this meant for/ who is the common user of this library?
+
+## Authors and Maintainers
+
+!!! warning "Developer Note - Remove Me!"
+    Add the team and/or the main individuals maintaining this project. Include historical maintainers as well.
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/docs/user/lib_use_cases.md b/docs/user/lib_use_cases.md
index ada1e9fc..17c0aab7 100644
--- a/docs/user/lib_use_cases.md
+++ b/docs/user/lib_use_cases.md
@@ -1,5 +1,6 @@
 # Using the Library
 
+<<<<<<< HEAD
 As the Python library is intended to be a low-level implementation, the primary use case is within Code. On this page as well as subsequent pages we will provide an overview on the type of functions and examples.
 
 # Function Groupings
@@ -84,3 +85,15 @@ Often times interfaces will come in various different shortened names, and it is
 
 !!! tip
     These are just some examples of the many functions provided by this library. Please review the Developer code for Examples on every public function
+=======
+This document describes common use-cases and scenarios for this library.
+
+## General Usage
+
+## Use-cases and common workflows
+
+## Screenshots
+
+!!! warning "Developer Note - Remove Me!"
+    Ideally captures every view exposed by the Library. Should include a relevant dataset.
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/example.invoke.yml b/example.invoke.yml
new file mode 100644
index 00000000..8a6890e7
--- /dev/null
+++ b/example.invoke.yml
@@ -0,0 +1,7 @@
+---
+"netutils":
+  python_ver: "3.8"
+  local: false
+  # image_name: "netutils"
+  # image_ver: "latest"
+  # pwd: "."
diff --git a/mkdocs.yml b/mkdocs.yml
index 5fb748b5..85fe7837 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,10 +1,18 @@
 ---
 dev_addr: "127.0.0.1:8001"
+<<<<<<< HEAD
 edit_uri: "edit/develop/docs"
 site_dir: "netutils/static/netutils/docs"
 site_name: "Netutils Documentation"
 site_url: "https://netutils.readthedocs.io/en/latest/"
 repo_url: "https://github.com/networktocode/netutils"
+=======
+edit_uri: "edit/main/netutils/docs"
+site_dir: "netutils/static/netutils/docs"
+site_name: "netutils Documentation"
+site_url: "https://netutils.readthedocs.io/"
+repo_url: "https://github.com/networktocode-llc/netutils"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 copyright: "Copyright &copy; The Authors"
 theme:
   name: "material"
@@ -14,7 +22,14 @@ theme:
     - "python"
     - "yaml"
   features:
+<<<<<<< HEAD
+    - "content.code.copy"
+=======
+    - "content.action.edit"
+    - "content.action.view"
     - "content.code.copy"
+    - "navigation.footer"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     - "navigation.indexes"
     - "navigation.tabs"
     - "navigation.tabs.sticky"
@@ -43,12 +58,15 @@ theme:
 extra_css:
   - "assets/extra.css"
 
+<<<<<<< HEAD
 # needed for RTD version flyout menu
 # jquery is not (yet) injected by RTD automatically and it might be dropped
 # as a dependency in the future
 extra_javascript:
   - "https://code.jquery.com/jquery-3.6.0.min.js"
 
+=======
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 extra:
   generator: false
   ntc_sponsor: true
@@ -76,10 +94,21 @@ markdown_extensions:
       permalink: true
   - "attr_list"
   - "md_in_html"
+<<<<<<< HEAD
+=======
+  - "markdown_data_tables":
+      base_path: "docs"
+  - "pymdownx.details"
+  # Need pymdownx.emoji for Grid icon search
+  - pymdownx.emoji:
+      emoji_index: !!python/name:material.extensions.emoji.twemoji
+      emoji_generator: !!python/name:material.extensions.emoji.to_svg
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
   - "pymdownx.highlight":
       anchor_linenums: true
   - "pymdownx.inlinehilite"
   - "pymdownx.snippets"
+<<<<<<< HEAD
   - "pymdownx.superfences"
   - "footnotes"
 plugins:
@@ -90,20 +119,53 @@ plugins:
         - "netutils.config.parser"
       classy_libraries:
         - "netutils"
+=======
+  - "pymdownx.superfences":
+      custom_fences:
+        - name: "mermaid"
+          class: "mermaid"
+          format: !!python/name:pymdownx.superfences.fence_code_format
+  - "pymdownx.tabbed":
+      "alternate_style": true
+  - "pymdownx.tilde"
+
+plugins:
+  - "search"
+  - "gen-files":
+      scripts:
+        - "docs/generate_code_reference_pages.py"
+  - "glightbox":
+      manual: true # See https://blueswen.github.io/mkdocs-glightbox/flexibility/enable-by-image-or-page/
+  - "section-index"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
   - "mkdocstrings":
       default_handler: "python"
       handlers:
         python:
           paths: ["."]
           options:
+<<<<<<< HEAD
             show_root_heading: true
 watch:
   - "README.md"
+=======
+            heading_level: 1
+            show_root_heading: true
+            show_root_members_full_path: true
+            show_source: false
+
+validation:
+  absolute_links: "warn"
+  anchors: "warn"
+  omitted_files: "warn"
+  unrecognized_links: "warn"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 nav:
   - Overview: "index.md"
   - User Guide:
       - Library Overview: "user/lib_overview.md"
+<<<<<<< HEAD
       - Using the Library: "user/lib_use_cases.md"
       - Jinja Filters: "user/lib_use_cases_jinja_filters.md"
       - Library Mapper: "user/lib_use_cases_lib_mapper.md"
@@ -114,6 +176,10 @@ nav:
       - ACL: "user/lib_use_cases_acl.md"
       - Upgrade Paths: "user/lib_upgrade_paths.md"
       - Getting Started: "user/lib_getting_started.md"
+=======
+      - Getting Started: "user/lib_getting_started.md"
+      - Using the Library: "user/lib_use_cases.md"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
       - Frequently Asked Questions: "user/faq.md"
   - Administrator Guide:
       - Install and Configure: "admin/install.md"
@@ -121,6 +187,7 @@ nav:
       - Uninstall: "admin/uninstall.md"
       - Release Notes:
           - "admin/release_notes/index.md"
+<<<<<<< HEAD
           - v1.15: "admin/release_notes/version_1.15.md"
           - v1.14: "admin/release_notes/version_1.14.md"
           - v1.13: "admin/release_notes/version_1.13.md"
@@ -139,11 +206,15 @@ nav:
           - v1.0: "admin/release_notes/version_1.0.md"
           - v0.2: "admin/release_notes/version_0.2.md"
           - v0.1: "admin/release_notes/version_0.1.md"
+=======
+          - v1.0: "admin/release_notes/version_1.0.md"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
   - Developer Guide:
       - Extending the Library: "dev/extending.md"
       - Contributing to the Library: "dev/contributing.md"
       - Development Environment: "dev/dev_environment.md"
       - Release Checklist: "dev/release_checklist.md"
+<<<<<<< HEAD
       - Config Parser Development: "dev/dev_config.md"
       - Arch Decision Records: "dev/dev_adr.md"
       - Code Attribution to the Library: "dev/attribution.md"
@@ -177,3 +248,6 @@ nav:
 not_in_nav: |
   - "user/include_jinja_list.md"
   - "user/lib_mapper/*.md"
+=======
+      - Architecture Design Records: "dev/arch_decision.md"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/netutils/api.py b/netutils/api.py
new file mode 100644
index 00000000..a92b3f3b
--- /dev/null
+++ b/netutils/api.py
@@ -0,0 +1,3 @@
+"""Example API."""
+
+# Fill in with information regarding Python API for project
diff --git a/netutils/cli.py b/netutils/cli.py
new file mode 100644
index 00000000..92abd247
--- /dev/null
+++ b/netutils/cli.py
@@ -0,0 +1,27 @@
+"""Example cli using click."""
+
+import logging
+
+import click
+
+from netutils.log import initialize_logging
+
+# Import necessary project related things to use in CLI
+
+log = logging.getLogger(__name__)
+
+
+@click.command()
+@click.option("--test", default="Test Output", help="Test argument")
+@click.option(
+    "--log-level",
+    default="INFO",
+    type=click.Choice(["NOTSET", "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"]),
+    help="Logging level",
+)
+@click.option("--log-file", default=None, help="Log file to output to debug logs to.")
+def main(test, log_level, log_file):
+    """Entrypoint into CLI app."""
+    initialize_logging(level=log_level, filename=log_file)
+    log.info("Entrypoint of the CLI app.")
+    print(test)
diff --git a/netutils/log.py b/netutils/log.py
new file mode 100644
index 00000000..41002801
--- /dev/null
+++ b/netutils/log.py
@@ -0,0 +1,77 @@
+"""
+Logging utilities for netutils.
+
+This module contains helpers and wrappers for making logging more consistent across applications.
+
+How to use me:
+
+    >>> from netutils.log import initialize_logging
+    >>> log = initialize_logging(level="debug")
+    2021-12-07T10:51:49-0700 [DEBUG] [log] [initialize_logging] cookiecutter_project: Logging initialized.
+    >>> log.info("NTC")
+    2021-12-07T10:51:49-0700 [INFO] [cli] [main] cookiecutter_project.cli: Entrypoint of the CLI app.
+"""
+
+import logging.config
+
+APP = "netutils"
+
+
+def initialize_logging(config=None, level="INFO", filename=None):
+    """Initialize logging using sensible defaults.
+
+    Args:
+        config (dict): User provided configuration dictionary.
+        level (str): The level of logging for STDOUT logging.
+        filename (str): Where to output debug logging to file.
+
+    """
+    if not config:
+        config = {
+            "version": 1,
+            "disable_existing_loggers": False,
+            "formatters": {
+                "standard": {
+                    "format": "%(asctime)s [%(levelname)s] %(name)s: %(message)s",
+                    "datefmt": "%Y-%m-%dT%H:%M:%S%z",
+                },
+                "debug": {
+                    "format": "%(asctime)s [%(levelname)s] [%(module)s] [%(funcName)s] %(name)s: %(message)s",
+                    "datefmt": "%Y-%m-%dT%H:%M:%S%z",
+                },
+            },
+            "handlers": {
+                "standard": {
+                    "class": "logging.StreamHandler",
+                    "formatter": "standard",
+                    "level": level.upper(),
+                },
+            },
+            "loggers": {
+                "": {
+                    "handlers": ["standard"],
+                    "level": "DEBUG",
+                }
+            },
+        }
+
+        # If a filename is passed in, let's add a FileHandler
+        if filename:
+            config["handlers"].update(
+                {
+                    "file_output": {
+                        "class": "logging.FileHandler",
+                        "formatter": "debug",
+                        "level": "DEBUG",
+                        "filename": filename,
+                    }
+                }
+            )
+            config["loggers"][""]["handlers"].append("file_output")
+
+    # Configure the logging
+    logging.config.dictConfig(config)
+
+    # Initialize root logger and advise logging has been initialized
+    log = logging.getLogger(APP)
+    log.debug("Logging initialized.")
diff --git a/pyproject.toml b/pyproject.toml
index 9d2bdc64..eb7e7c82 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,5 +1,6 @@
 [tool.poetry]
 name = "netutils"
+<<<<<<< HEAD
 version = "1.15.2a0"
 description = "Common helper functions useful in network automation."
 authors = ["Network to Code, LLC <opensource@networktocode.com>"]
@@ -9,6 +10,13 @@ repository = "https://github.com/networktocode/netutils"
 documentation = "https://netutils.readthedocs.io"
 readme = "README.md"
 keywords = ["netutils", "network utils", "network utilities", "net-utils"]
+=======
+version = "1.15.1"
+description = ""Common helper functions useful in network automation.""
+authors = ["Network to Code, LLC <info@networktocode.com>"]
+readme = "README.md"
+license = "Apache-2.0"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 classifiers = [
     "Intended Audience :: Developers",
     "Development Status :: 5 - Production/Stable",
@@ -17,16 +25,25 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+<<<<<<< HEAD
     "Programming Language :: Python :: 3.13",
 ]
 include = [
     "LICENSE",
     "README.md",
     "netutils/protocols.json"
+=======
+]
+
+include = [
+    "LICENSE",
+    "README.md",
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 ]
 
 [tool.poetry.dependencies]
 python = "^3.8"
+<<<<<<< HEAD
 napalm = {version = "^4.0.0", optional = true}
 jsonschema = {version = "^4.17.3", optional = true}
 legacycrypt = {version = "0.3", optional = true}
@@ -59,6 +76,60 @@ mkdocstrings-python = "1.10.8"
 mkdocs-autorefs = "1.2.0"
 griffe = "1.1.1"
 mkdocs-python-classy = "0.1.3"
+=======
+click = "*"
+
+[tool.poetry.group.dev.dependencies]
+requests_mock = "*"
+pytest = "*"
+mock = "*"
+pyyaml = "^6.0.1"
+pylint = "^3.1.0"
+yamllint = "^1.35.1"
+invoke = "^2.2.0"
+toml = "^0.10.2"
+attrs = "^23.2.0"
+towncrier = ">=23.6.0,<=24.8.0"
+ruff = "*"
+Markdown = "*"
+
+[tool.poetry.group.docs.dependencies]
+# Rendering docs to HTML
+mkdocs = "1.6.1"
+# Embedding YAML files into Markdown documents as tables
+markdown-data-tables = "1.0.0"
+# Render custom markdown for version added/changed/remove notes
+markdown-version-annotations = "1.0.1"
+# Automatically generate some files as part of mkdocs build
+mkdocs-gen-files = "0.5.0"
+# Image lightboxing in mkdocs
+mkdocs-glightbox = "0.4.0"
+# Use Jinja2 templating in docs - see settings.md
+mkdocs-macros-plugin = "1.3.7"
+# Material for mkdocs theme
+mkdocs-material = "9.6.15"
+# Handle docs redirections
+mkdocs-redirects = "1.2.2"
+# Automatically handle index pages for docs sections
+mkdocs-section-index = "0.3.10"
+# Automatic documentation from sources, for MkDocs
+mkdocstrings = "0.27.0"
+# Python-specific extension to mkdocstrings
+mkdocstrings-python = "1.13.0"
+griffe = "1.1.1"
+
+[tool.poetry.scripts]
+netutils = 'netutils.cli:main'
+
+[tool.netutils]
+string_required = "some string"
+array_default = ["a", "b", "c"]
+url_default = "http://localhost"
+ip_address = "192.168.0.1"
+ip_network = "2001:db8:3c4d:15::/64"
+file = "README.md"
+
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 [tool.ruff]
 line-length = 120
@@ -99,6 +170,7 @@ convention = "google"
     "S"
 ]
 
+<<<<<<< HEAD
 [tool.pylint.basic]
 # No docstrings required for private methods (Pylint default), or for test_ functions, or for inner Meta classes.
 no-docstring-rgx="^(_|test_|Meta$)"
@@ -111,6 +183,23 @@ disable = """,
     line-too-long,
     consider-iterating-dictionary,
     """
+=======
+
+[tool.pylint.master]
+ignore=[".venv", "tests"]
+
+[tool.pylint.basic]
+# No docstrings required for private methods (Pylint default), or for test_ functions, or for inner Meta classes.
+no-docstring-rgx = "^(_|test_|Meta$)"
+
+
+[tool.pylint.messages_control]
+disable = [
+    "line-too-long",
+    "duplicate-code",
+    "cyclic-import",
+    ]
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 
 [tool.pylint.miscellaneous]
 # Don't flag TODO as a failure, let us commit with things that still need to be done in the code
@@ -120,11 +209,16 @@ notes = """,
     """
 
 [build-system]
+<<<<<<< HEAD
 requires = ["poetry-core>=1.0.0"]
+=======
+requires = ["poetry_core>=1.0.0"]
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 build-backend = "poetry.core.masonry.api"
 
 [tool.pytest.ini_options]
 python_paths = "./"
+<<<<<<< HEAD
 testpaths = "tests/"
 addopts = "-vv --doctest-modules -p no:warnings --ignore-glob='*mock*'"
 
@@ -150,6 +244,13 @@ strict_equality = true
 exclude = ["tests/", "tasks.py"]
 show_error_codes = true
 
+=======
+testpaths = [
+    "tests/"
+]
+addopts = "-vv --doctest-modules -p no:warnings --ignore-glob='*mock*'"
+
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 [tool.towncrier]
 package = "netutils"
 directory = "changes"
diff --git a/tasks.py b/tasks.py
index 87ea81d5..fc705cc7 100644
--- a/tasks.py
+++ b/tasks.py
@@ -1,5 +1,9 @@
 """Tasks for use with Invoke."""
 
+<<<<<<< HEAD
+=======
+import os
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 import re
 from pathlib import Path
 
@@ -10,8 +14,12 @@
 def is_truthy(arg):
     """Convert "truthy" strings into Booleans.
 
+<<<<<<< HEAD
     Examples
     --------
+=======
+    Examples:
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
         >>> is_truthy('yes')
         True
     Args:
@@ -30,17 +38,29 @@ def is_truthy(arg):
 
 
 # Use pyinvoke configuration for default values, see http://docs.pyinvoke.org/en/stable/concepts/configuration.html
+<<<<<<< HEAD
 # Variables may be overwritten in invoke.yml or by the environment variables INVOKE_PYNTC_xxx
+=======
+# Variables may be overwritten in invoke.yml or by the environment variables INVOKE_NETUTILS_xxx
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 namespace = Collection("netutils")
 namespace.configure(
     {
         "netutils": {
             "project_name": "netutils",
+<<<<<<< HEAD
             "python_ver": "3.13",
             "local": False,
             "image_name": "netutils",
             "image_ver": "latest",
             "pwd": ".",
+=======
+            "python_ver": "3.8",
+            "local": is_truthy(os.getenv("INVOKE_NETUTILS_IMAGE_NAME", "false")),
+            "image_name": "netutils",
+            "image_ver": os.getenv("INVOKE_PARSER_IMAGE_VER", "latest"),
+            "pwd": Path(__file__).parent,
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
         }
     }
 )
@@ -98,6 +118,12 @@ def run_command(context, exec_cmd, port=None):
     return result
 
 
+<<<<<<< HEAD
+=======
+# ------------------------------------------------------------------------------
+# BUILD
+# ------------------------------------------------------------------------------
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 @task(
     help={
         "cache": "Whether to use Docker's cache when building images (default enabled)",
@@ -123,9 +149,37 @@ def build(context, cache=True, force_rm=False, hide=False):
 
 
 @task
+<<<<<<< HEAD
 def clean(context):
     """Remove the project specific image."""
     print(f"Attempting to forcefully remove image {context.netutils.image_name}:{context.netutils.image_ver}")
+=======
+def generate_packages(context):
+    """Generate all Python packages inside docker and copy the file locally under dist/."""
+    command = "poetry build"
+    run_command(context, command)
+
+
+@task(
+    help={
+        "check": (
+            "If enabled, check for outdated dependencies in the poetry.lock file, "
+            "instead of generating a new one. (default: disabled)"
+        )
+    }
+)
+def lock(context, check=False):
+    """Generate poetry.lock inside the library container."""
+    run_command(context, f"poetry {'check' if check else 'lock --no-update'}")
+
+
+@task
+def clean(context):
+    """Remove the project specific image."""
+    print(
+        f"Attempting to forcefully remove image {context.netutils.image_name}:{context.netutils.image_ver}"
+    )
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     context.run(f"docker rmi {context.netutils.image_name}:{context.netutils.image_ver} --force")
     print(f"Successfully removed image {context.netutils.image_name}:{context.netutils.image_ver}")
 
@@ -138,6 +192,7 @@ def rebuild(context):
 
 
 @task
+<<<<<<< HEAD
 def coverage(context):
     """Run the coverage report against pytest.
 
@@ -158,6 +213,11 @@ def pytest(context):
         context (obj): Used to run specific commands
     """
     exec_cmd = "pytest -vv --doctest-modules netutils/ && coverage run --source=netutils -m pytest && coverage report"
+=======
+def pytest(context, args=""):
+    """Run pytest test cases."""
+    exec_cmd = f"pytest {args}"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     run_command(context, exec_cmd)
 
 
@@ -207,6 +267,7 @@ def ruff(context, action=None, target=None, fix=False, output_format="concise"):
 
 
 @task
+<<<<<<< HEAD
 def mypy(context):
     """Run mypy to validate typing-hints.
 
@@ -219,14 +280,21 @@ def mypy(context):
 
 
 @task
+=======
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
 def pylint(context):
     """Run pylint for the specified name and Python version.
 
     Args:
         context (obj): Used to run specific commands
+<<<<<<< HEAD
         local (bool): Define as `True` to execute locally
     """
     exec_cmd = 'find . -name "*.py" | grep -vE "(tests/unit/mock|netutils/data_files)" | xargs pylint'
+=======
+    """
+    exec_cmd = 'find . -name "*.py" | grep -vE "tests/unit" | xargs pylint'
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     run_command(context, exec_cmd)
 
 
@@ -236,7 +304,10 @@ def yamllint(context):
 
     Args:
         context (obj): Used to run specific commands
+<<<<<<< HEAD
         local (bool): Define as `True` to execute locally
+=======
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     """
     exec_cmd = "yamllint ."
     run_command(context, exec_cmd)
@@ -253,12 +324,22 @@ def cli(context):
     context.run(f"{dev}", pty=True)
 
 
+<<<<<<< HEAD
 @task
 def tests(context):
+=======
+@task(
+    help={
+        "lint-only": "Only run linters; unit tests will be excluded. (default: False)",
+    }
+)
+def tests(context, lint_only=False):
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     """Run all tests for the specified name and Python version.
 
     Args:
         context (obj): Used to run specific commands
+<<<<<<< HEAD
     """
     ruff(context)
     pylint(context)
@@ -266,12 +347,35 @@ def tests(context):
     mypy(context)
     pytest(context)
 
+=======
+        lint_only (bool): If True, only run linters and skip unit tests.
+    """
+    # If we are not running locally, start the docker containers so we don't have to for each test
+    # Sorted loosely from fastest to slowest
+    print("Running ruff...")
+    ruff(context)
+    print("Running yamllint...")
+    yamllint(context)
+    print("Running poetry check...")
+    lock(context, check=True)
+    print("Running pylint...")
+    pylint(context)
+    print("Running mkdocs...")
+    build_and_check_docs(context)
+    if not lint_only:
+        print("Running unit tests...")
+        pytest(context)
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     print("All tests have passed!")
 
 
 @task
 def build_and_check_docs(context):
+<<<<<<< HEAD
     """Build documentation to be available within Docs Sites."""
+=======
+    """Build documentation and test the configuration."""
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     command = "mkdocs build --no-directory-urls --strict"
     run_command(context, command)
 
@@ -290,7 +394,11 @@ def build_and_check_docs(context):
 @task
 def docs(context):
     """Build and serve docs locally for development."""
+<<<<<<< HEAD
     exec_cmd = "mkdocs serve -v --dev-addr=0.0.0.0:8001"
+=======
+    exec_cmd = "mkdocs serve -v"
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
     run_command(context, exec_cmd, port="8001:8001")
 
 
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
index de331952..b42742ec 100644
--- a/tests/unit/conftest.py
+++ b/tests/unit/conftest.py
@@ -1,5 +1,6 @@
 """Used to setup fixtures to be used through tests"""
 
+<<<<<<< HEAD
 import importlib.util
 import json
 import os
@@ -68,3 +69,13 @@ def _method(_file, attr):
         return getattr(module, attr)
 
     return _method
+=======
+import pytest
+from click.testing import CliRunner
+
+
+@pytest.fixture
+def cli_runner():
+    """Provide CLI runner for Click tests."""
+    return CliRunner()
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)
diff --git a/tests/unit/test_basic.py b/tests/unit/test_basic.py
new file mode 100644
index 00000000..1cfe63c5
--- /dev/null
+++ b/tests/unit/test_basic.py
@@ -0,0 +1,48 @@
+"""Basic tests that do not require Django."""
+
+# import os
+# import re
+# import unittest
+
+# import toml
+
+
+# class TestDocsPackaging(unittest.TestCase):
+#     """Test Version in doc requirements is the same pyproject."""
+
+#     def test_version(self):
+#         """Verify that pyproject.toml dev dependencies have the same versions as in the docs requirements.txt."""
+#         parent_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
+#         poetry_path = os.path.join(parent_path, "pyproject.toml")
+#         poetry_details = toml.load(poetry_path)["tool"]["poetry"]["group"]["dev"]["dependencies"]
+#         with open(f"{parent_path}/docs/requirements.txt", "r", encoding="utf-8") as file:
+#             requirements = [line for line in file.read().splitlines() if (len(line) > 0 and not line.startswith("#"))]
+#         for pkg in requirements:
+#             package_name = pkg
+#             if len(pkg.split("==")) == 2:  # noqa: PLR2004
+#                 package_name, version = pkg.split("==")
+#             else:
+#                 version = "*"
+#             self.assertEqual(poetry_details[package_name], version)
+
+
+# class TestDocsReleaseNotes(unittest.TestCase):
+#     """Test that mkdocs has the release notes for the current version."""
+
+#     def test_version_file_found(self):
+#         """Verify that if the current version has no letters, which would see in alpha or beta has an associated release note file."""
+#         parent_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.realpath(__file__))))
+#         poetry_path = os.path.join(parent_path, "pyproject.toml")
+#         project_version = toml.load(poetry_path)["tool"]["poetry"]["version"]
+
+#         docs_path = os.path.join(parent_path, "docs")
+#         release_notes_files = [file for file in os.listdir(f"{docs_path}/admin/release_notes/") if file.endswith(".md")]
+#         version_pattern = re.compile(r"^(\d+)\.(\d+)\.\d+$")
+
+#         match = version_pattern.match(project_version)
+#         # If there is no match, then it is likely an alpha or beta version and we can skip this test.
+#         if match:
+#             major, minor = match.groups()
+#             version_str = f"version_{major}.{minor}.md"
+#             if version_str not in release_notes_files:
+#                 self.fail(f"Release note file for version {version_str} not found in release notes folder.")
diff --git a/tests/unit/test_cli.py b/tests/unit/test_cli.py
new file mode 100644
index 00000000..b743798a
--- /dev/null
+++ b/tests/unit/test_cli.py
@@ -0,0 +1,16 @@
+"""Example Test using Fixtures."""
+
+import mock
+
+from netutils import cli
+
+
+@mock.patch("netutils.cli.log")
+def test_cli_logging(log, cli_runner):
+    """Assert our logging gets called in CLI app."""
+    result = cli_runner.invoke(cli.main, ["--test", "ntc"])
+
+    assert result.exit_code == 0
+    assert result.output == "ntc\n"
+    log.info.assert_called()
+    log.info.assert_called_with("Entrypoint of the CLI app.")
diff --git a/tests/unit/test_logging.py b/tests/unit/test_logging.py
new file mode 100644
index 00000000..a05cf26e
--- /dev/null
+++ b/tests/unit/test_logging.py
@@ -0,0 +1,58 @@
+"""Validate netutils logging works."""
+
+import mock
+
+import netutils
+
+
+@mock.patch("logging.config.dictConfig")
+@mock.patch("logging.getLogger")
+def test_initialize_logging_default(get_logger, basic_cfg):
+    """Test initialize_logging using defaults."""
+    netutils.log.initialize_logging()
+
+    basic_cfg.assert_called_once()
+    initial_call = basic_cfg.mock_calls[0].args[0]
+    assert set(initial_call.keys()) == set(["version", "disable_existing_loggers", "formatters", "handlers", "loggers"])
+    assert initial_call["handlers"]["standard"]["level"] == "INFO"
+
+    get_logger.assert_called_once()
+    assert get_logger.mock_calls[0].args == ("netutils",)
+    assert get_logger.mock_calls[1].args == ("Logging initialized.",)
+
+
+@mock.patch("logging.config.dictConfig")
+@mock.patch("logging.getLogger")
+def test_initialize_logging_user_defined_config(get_logger, basic_cfg):
+    """Test initialize_logging with user defined config."""
+    config = {"version": 1, "disable_existing_loggers": False}
+    netutils.log.initialize_logging(config=config)
+
+    basic_cfg.assert_called_once()
+    initial_call = basic_cfg.mock_calls[0].args[0]
+    assert initial_call == config
+
+    get_logger.assert_called_once()
+    assert get_logger.mock_calls[0].args == ("netutils",)
+    assert get_logger.mock_calls[1].args == ("Logging initialized.",)
+
+
+@mock.patch("logging.config.dictConfig")
+@mock.patch("logging.getLogger")
+def test_initialize_logging_filename(get_logger, basic_cfg):
+    """Test initialize_logging with filename."""
+    netutils.log.initialize_logging(filename="output.log")
+
+    basic_cfg.assert_called_once()
+    initial_call = basic_cfg.mock_calls[0].args[0]
+    assert set(initial_call.keys()) == set(["version", "disable_existing_loggers", "formatters", "handlers", "loggers"])
+    assert initial_call["handlers"]["standard"]["level"] == "INFO"
+    assert initial_call["handlers"]["file_output"]["filename"] == "output.log"
+    assert initial_call["handlers"]["file_output"]["level"] == "DEBUG"
+    assert initial_call["handlers"]["file_output"]["formatter"] == "debug"
+    assert initial_call["handlers"]["file_output"]["class"] == "logging.FileHandler"
+    assert "file_output" in initial_call["loggers"][""]["handlers"]
+
+    get_logger.assert_called_once()
+    assert get_logger.mock_calls[0].args == ("netutils",)
+    assert get_logger.mock_calls[1].args == ("Logging initialized.",)
diff --git a/towncrier_template.j2 b/towncrier_template.j2
index 2c1316f5..83387657 100644
--- a/towncrier_template.j2
+++ b/towncrier_template.j2
@@ -40,3 +40,7 @@ No significant changes.
 
 {% endif %}
 {% endfor %}
+<<<<<<< HEAD
+=======
+
+>>>>>>> 5806227 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)