60 changed files with 1923 additions and 3568 deletions
--- a/.coveragerc
+++ b/.coveragerc
@ -1,7 +1,8 @@
 [run]
 source = src/
 branch = true
-command_line = -m unittest discover
+omit =
+    .venv/*

 [report]
 fail_under = 100
@ -10,3 +11,5 @@ skip_covered = False
 exclude_lines =
    if TYPE_CHECKING:
    if __name__ == ['"]__main__['"]:
+omit =
+    tests/*
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@ -1,88 +0,0 @@
-name: CI
-on:
-  push:
-    branches: [master]
-jobs:
-  tests:
-    name: Python ${{ matrix.python-version }} Tests
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python-version:
-        - '3.8'
-        - '3.9'
-        - '3.10'
-    steps:
-    - uses: actions/checkout@v3
-
-    - uses: actions/setup-python@v3
-      with:
-        python-version: ${{ matrix.python-version }}
-        cache: 'pip'
-        cache-dependency-path: 'requirements/dev.txt'
-
-    - name: Upgrade packaging tools
-      run: pip install -U pip
-
-    - name: Install dependencies
-      run: pip install -U -r requirements/dev.txt
-
-    - name: Install asyncio-taskpool
-      run: pip install -e .
-
-    - name: Run tests for Python ${{ matrix.python-version }}
-      if: ${{ matrix.python-version != '3.10' }}
-      run: python -m tests
-
-    - name: Run tests for Python 3.10 and save coverage
-      if: ${{ matrix.python-version == '3.10' }}
-      run: echo "coverage=$(./coverage.sh)" >> $GITHUB_ENV
-    
-    outputs:
-      coverage: ${{ env.coverage }}
-
-  update_badges:
-    needs: tests
-    name: Update Badges
-    env:
-      meta_gist_id: 3f8240a976e8781a765d9c74a583dcda
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - name: Download `cloc`
-        run: sudo apt-get update -y && sudo apt-get install -y cloc
-
-      - name: Count lines of code/comments
-        run: |
-          echo "cloc_code=$(./cloc.sh -c src/)" >> $GITHUB_ENV
-          echo "cloc_comments=$(./cloc.sh -m src/)" >> $GITHUB_ENV
-          echo "cloc_commentpercent=$(./cloc.sh -p src/)" >> $GITHUB_ENV
-
-      - name: Create badge for lines of code
-        uses: Schneegans/dynamic-badges-action@v1.2.0
-        with:
-          auth: ${{ secrets.GIST_META_DATA }}
-          gistID: ${{ env.meta_gist_id }}
-          filename: cloc-code.json
-          label: Lines of Code
-          message: ${{ env.cloc_code }}
-
-      - name: Create badge for lines of comments
-        uses: Schneegans/dynamic-badges-action@v1.2.0
-        with:
-          auth: ${{ secrets.GIST_META_DATA }}
-          gistID: ${{ env.meta_gist_id }}
-          filename: cloc-comments.json
-          label: Comments
-          message: ${{ env.cloc_comments }} (${{ env.cloc_commentpercent }}%)
-
-      - name: Create badge for test coverage
-        uses: Schneegans/dynamic-badges-action@v1.2.0
-        with:
-          auth: ${{ secrets.GIST_META_DATA }}
-          gistID: ${{ env.meta_gist_id }}
-          filename: test-coverage.json
-          label: Coverage
-          message: ${{ needs.tests.outputs.coverage }}
--- a/.gitignore
+++ b/.gitignore
@ -3,10 +3,9 @@
 # IDE settings:
 /.idea/
 /.vscode/
-# Distribution / build files:
+# Distribution / packaging:
 *.egg-info/
 /dist/
-/docs/build/
 # Python cache:
 __pycache__/
 # Testing:
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@ -1,11 +0,0 @@
-version: 2
-build:
-  os: 'ubuntu-20.04'
-  tools:
-    python: '3.8'
-python:
-  install:
-    - method: pip
-      path: .
-sphinx:
-  fail_on_warning: true
--- a/README.md
+++ b/README.md
@ -1,42 +1,10 @@
-[//]: # (This file is part of asyncio-taskpool.)
-
-[//]: # (asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of)
-[//]: # (version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.)
-
-[//]: # (asyncio-taskpool 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 Lesser General Public License for more details.)
-
-[//]: # (You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool.)
-[//]: # (If not, see <https://www.gnu.org/licenses/>.)
-
 # asyncio-taskpool

-[![GitHub last commit][github-last-commit-img]][github-last-commit]
-![Lines of code][gist-cloc-code-img]
-![Lines of comments][gist-cloc-comments-img]
-![Test coverage][gist-test-coverage-img]
-[![License: LGPL v3.0][lgpl3-img]][lgpl3]
-[![PyPI version][pypi-latest-version-img]][pypi-latest-version]
-
 **Dynamically manage pools of asyncio tasks**

-Full documentation available at [RtD](https://asyncio-taskpool.readthedocs.io/en/latest).
-
---
-
-## Contents
- [Contents](#contents)
- [Summary](#summary)
- [Usage](#usage)
- [Installation](#installation)
- [Dependencies](#dependencies)
- [Testing](#testing)
- [License](#license)
-
 ## Summary

-A **task pool** is an object with a simple interface for aggregating and dynamically managing asynchronous tasks.
+A task pool is an object with a simple interface for aggregating and dynamically managing asynchronous tasks.

 With an interface that is intentionally similar to the [`multiprocessing.Pool`](https://docs.python.org/3/library/multiprocessing.html#module-multiprocessing.pool) class from the standard library, the `TaskPool` provides you such methods as `apply`, `map`, and `starmap` to execute coroutines concurrently as [`asyncio.Task`](https://docs.python.org/3/library/asyncio-task.html#task-object) objects. There is no limitation imposed on what kind of tasks can be run or in what combination, when new ones can be added, or when they can be cancelled.

@ -50,16 +18,25 @@ Generally speaking, a task is added to a pool by providing it with a coroutine f

 ```python
 from asyncio_taskpool import SimpleTaskPool
+
 ...
-async def work(_foo, _bar): ...
+
+
+async def work(foo, bar): ...
+
+
+...
+

 async def main():
    pool = SimpleTaskPool(work, args=('xyz', 420))
-    pool.start(5)
+    await pool.start(5)
    ...
    pool.stop(3)
    ...
+    pool.lock()
    await pool.gather_and_close()
+    ...
 ```

 Since one of the main goals of `asyncio-taskpool` is to be able to start/stop tasks dynamically or "on-the-fly", _most_ of the associated methods are non-blocking _most_ of the time. A notable exception is the `gather_and_close` method for awaiting the return of all tasks in the pool. (It is essentially a glorified wrapper around the [`asyncio.gather`](https://docs.python.org/3/library/asyncio-task.html#asyncio.gather) function.)
@ -78,7 +55,8 @@ Python Version 3.8+, tested on Linux

 ## Testing

-Install [`coverage`](https://coverage.readthedocs.io/en/latest/) with `pip`, then execute the [`./coverage.sh`](coverage.sh) shell script to run all unit tests and save the coverage report.
+Install `asyncio-taskpool[dev]` dependencies or just manually install `coverage` with `pip`. 
+Execute the [`./coverage.sh`](coverage.sh) shell script to run all unit tests and receive the coverage report.

 ## License

@ -86,16 +64,6 @@ Install [`coverage`](https://coverage.readthedocs.io/en/latest/) with `pip`, the

 The full license texts for the [GNU GPLv3.0](COPYING) and the [GNU LGPLv3.0](COPYING.LESSER) are included in this repository. If not, see https://www.gnu.org/licenses/.

---
+## Copyright

 © 2022 Daniil Fajnberg
-
-[github-last-commit]: https://github.com/daniil-berg/asyncio-taskpool/commits
-[github-last-commit-img]: https://img.shields.io/github/last-commit/daniil-berg/asyncio-taskpool?label=Last%20commit&logo=git&
-[gist-cloc-code-img]: https://img.shields.io/endpoint?logo=python&color=blue&url=https://gist.githubusercontent.com/daniil-berg/3f8240a976e8781a765d9c74a583dcda/raw/cloc-code.json
-[gist-cloc-comments-img]: https://img.shields.io/endpoint?logo=sharp&color=lightgrey&url=https://gist.githubusercontent.com/daniil-berg/3f8240a976e8781a765d9c74a583dcda/raw/cloc-comments.json
-[gist-test-coverage-img]: https://img.shields.io/endpoint?logo=pytest&color=blue&url=https://gist.githubusercontent.com/daniil-berg/3f8240a976e8781a765d9c74a583dcda/raw/test-coverage.json
-[lgpl3]: https://www.gnu.org/licenses/lgpl-3.0
-[lgpl3-img]: https://img.shields.io/badge/License-LGPL_v3.0-darkgreen.svg?logo=gnu
-[pypi-latest-version-img]: https://img.shields.io/pypi/v/asyncio-taskpool?color=teal&logo=pypi
-[pypi-latest-version]: https://pypi.org/project/asyncio-taskpool/
--- a/cloc.sh
+++ b/cloc.sh
@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-
-# This file is part of asyncio-taskpool.
-
-# asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-# version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-# asyncio-taskpool 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 Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool.
-# If not, see <https://www.gnu.org/licenses/>.
-
-typeset option
-if getopts 'bcmp' option; then
-  if [[ ${option} == [bcmp] ]]; then
-    shift
-  else
-    echo >&2 "Invalid option '$1' provided"
-    exit 1
-  fi
-fi
-
-typeset source=$1
-if [[ -z ${source} ]]; then
-  echo >&2 Source file/directory missing
-  exit 1
-fi
-
-typeset blank code comment commentpercent
-read blank comment code commentpercent < <( \
-  cloc --csv --quiet --hide-rate --include-lang Python ${source} |
-  awk -F, '$2 == "SUM" {printf ("%d %d %d %1.0f", $3, $4, $5, 100 * $4 / ($5 + $4)); exit}'
-)
-
-case ${option} in
-  b) echo ${blank} ;;
-  c) echo ${code} ;;
-  m) echo ${comment} ;;
-  p) echo ${commentpercent} ;;
-  *) echo Blank lines: ${blank}
-     echo Lines of comments: ${comment}
-     echo Lines of code: ${code}
-     echo Comment percentage: ${commentpercent} ;;
-esac
--- a/coverage.sh
+++ b/coverage.sh
@ -1,25 +1,3 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh

-# This file is part of asyncio-taskpool.
-
-# asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-# version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-# asyncio-taskpool 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 Lesser General Public License for more details.
-
-# You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool.
-# If not, see <https://www.gnu.org/licenses/>.
-
-coverage erase
-coverage run 2> /dev/null
-
-typeset report=$(coverage report)
-typeset total=$(echo "${report}" | awk '$1 == "TOTAL" {print $NF; exit}')
-
-if [[ ${total} == 100% ]]; then
-  echo ${total}
-else
-  echo "${report}"
-fi
+coverage erase && coverage run -m unittest discover && coverage report
--- a/docs/Makefile
+++ b/docs/Makefile
@ -1,20 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line, and also
-# from the environment for the first two.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = source
-BUILDDIR      = build
-
-# Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
--- a/docs/make.bat
+++ b/docs/make.bat
@ -1,35 +0,0 @@
-@ECHO OFF
-
-pushd %~dp0
-
-REM Command file for Sphinx documentation
-
-if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
-)
-set SOURCEDIR=source
-set BUILDDIR=build
-
-if "%1" == "" goto help
-
-%SPHINXBUILD% >NUL 2>NUL
-if errorlevel 9009 (
-	echo.
-	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
-	echo.installed, then set the SPHINXBUILD environment variable to point
-	echo.to the full path of the 'sphinx-build' executable. Alternatively you
-	echo.may add the Sphinx directory to PATH.
-	echo.
-	echo.If you don't have Sphinx installed, grab it from
-	echo.https://www.sphinx-doc.org/
-	exit /b 1
-)
-
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-goto end
-
-:help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
-
-:end
-popd
--- a/docs/source/_static/.placeholder
+++ b/docs/source/_static/.placeholder
--- a/docs/source/api/api.rst
+++ b/docs/source/api/api.rst
@ -1,7 +0,0 @@
-API
-===
-
-.. toctree::
-   :maxdepth: 4
-
-   asyncio_taskpool
--- a/docs/source/api/asyncio_taskpool.control.client.rst
+++ b/docs/source/api/asyncio_taskpool.control.client.rst
@ -1,7 +0,0 @@
-asyncio\_taskpool.control.client module
-=======================================
-
-.. automodule:: asyncio_taskpool.control.client
-   :members:
-   :undoc-members:
-   :show-inheritance:
--- a/docs/source/api/asyncio_taskpool.control.rst
+++ b/docs/source/api/asyncio_taskpool.control.rst
@ -1,16 +0,0 @@
-asyncio\_taskpool.control package
-=================================
-
-.. automodule:: asyncio_taskpool.control
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Submodules
----------
-
-.. toctree::
-   :maxdepth: 4
-
-   asyncio_taskpool.control.client
-   asyncio_taskpool.control.server
--- a/docs/source/api/asyncio_taskpool.control.server.rst
+++ b/docs/source/api/asyncio_taskpool.control.server.rst
@ -1,7 +0,0 @@
-asyncio\_taskpool.control.server module
-=======================================
-
-.. automodule:: asyncio_taskpool.control.server
-   :members:
-   :undoc-members:
-   :show-inheritance:
--- a/docs/source/api/asyncio_taskpool.exceptions.rst
+++ b/docs/source/api/asyncio_taskpool.exceptions.rst
@ -1,7 +0,0 @@
-asyncio\_taskpool.exceptions module
-===================================
-
-.. automodule:: asyncio_taskpool.exceptions
-   :members:
-   :undoc-members:
-   :show-inheritance:
--- a/docs/source/api/asyncio_taskpool.pool.rst
+++ b/docs/source/api/asyncio_taskpool.pool.rst
@ -1,7 +0,0 @@
-asyncio\_taskpool.pool module
-=============================
-
-.. automodule:: asyncio_taskpool.pool
-   :members:
-   :undoc-members:
-   :show-inheritance:
--- a/docs/source/api/asyncio_taskpool.queue_context.rst
+++ b/docs/source/api/asyncio_taskpool.queue_context.rst
@ -1,7 +0,0 @@
-asyncio\_taskpool.queue\_context module
-=======================================
-
-.. automodule:: asyncio_taskpool.queue_context
-   :members:
-   :undoc-members:
-   :show-inheritance:
--- a/docs/source/api/asyncio_taskpool.rst
+++ b/docs/source/api/asyncio_taskpool.rst
@ -1,25 +0,0 @@
-asyncio\_taskpool package
-=========================
-
-.. automodule:: asyncio_taskpool
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
-Subpackages
-----------
-
-.. toctree::
-   :maxdepth: 4
-
-   asyncio_taskpool.control
-
-Submodules
----------
-
-.. toctree::
-   :maxdepth: 4
-
-   asyncio_taskpool.exceptions
-   asyncio_taskpool.pool
-   asyncio_taskpool.queue_context
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@ -1,60 +0,0 @@
-# Configuration file for the Sphinx documentation builder.
-#
-# This file only contains a selection of the most common options. For a full
-# list see the documentation:
-# https://www.sphinx-doc.org/en/master/usage/configuration.html
-
-# -- Path setup --------------------------------------------------------------
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#
-# import os
-# import sys
-# sys.path.insert(0, os.path.abspath('.'))
-
-
-# -- Project information -----------------------------------------------------
-
-project = 'asyncio-taskpool'
-copyright = '2022 Daniil Fajnberg'
-author = 'Daniil Fajnberg'
-
-# The full version, including alpha/beta/rc tags
-release = '1.1.4'
-
-
-# -- General configuration ---------------------------------------------------
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-    'sphinx.ext.duration',
-    'sphinx.ext.napoleon'
-]
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-# This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = []
-
-
-# -- Options for HTML output -------------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-#
-html_theme = 'sphinx_rtd_theme'
-html_theme_options = {
-    'style_external_links': True,
-}
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@ -1,58 +0,0 @@
-.. This file is part of asyncio-taskpool.
-
-.. asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-   version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-.. asyncio-taskpool 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 Lesser General Public License for more details.
-
-.. You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool.
-   If not, see <https://www.gnu.org/licenses/>.
-
-.. Copyright © 2022 Daniil Fajnberg
-
-
-Welcome to the asyncio-taskpool documentation!
-==============================================
-
-:code:`asyncio-taskpool` is a Python library for dynamically and conveniently managing pools of `asyncio <https://docs.python.org/3/library/asyncio.html>`_ tasks.
-
-Purpose
-------
-
-A `task <https://docs.python.org/3/library/asyncio-task.html>`_ is a very powerful tool of concurrency in the Python world. Since concurrency always implies doing more than one thing a time, you rarely deal with just one :code:`Task` instance. However, managing multiple tasks can become a bit cumbersome quickly, as their number increases. Moreover, especially in long-running code, you may find it useful (or even necessary) to dynamically adjust the extent to which the work is distributed, i.e. increase or decrease the number of tasks.
-
-With that in mind, this library aims to provide two things:
-
-#. An additional layer of abstraction and convenience for managing multiple tasks.
-#. A simple interface for dynamically adding and removing tasks when a program is already running.
-
-The first is achieved through the concept of a :doc:`task pool <pages/pool>`. The second is achieved by adding a :doc:`control server <pages/control>` to the task pool.
-
-Installation
------------
-
-.. code-block:: bash
-
-   $ pip install asyncio-taskpool
-
-
-Contents
--------
-
-.. toctree::
-   :maxdepth: 2
-
-   pages/pool
-   pages/ids
-   pages/control
-   api/api
-
-
-Indices and tables
------------------
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
--- a/docs/source/pages/control.rst
+++ b/docs/source/pages/control.rst
@ -1,107 +0,0 @@
-.. This file is part of asyncio-taskpool.
-
-.. asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-   version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-.. asyncio-taskpool 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 Lesser General Public License for more details.
-
-.. You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool.
-   If not, see <https://www.gnu.org/licenses/>.
-
-.. Copyright © 2022 Daniil Fajnberg
-
-Control interface
-=================
-
-When you are dealing with programs that run for a long period of time or even as daemons (i.e. indefinitely), having a way to adjust their behavior without needing to stop and restart them can be desirable.
-
-Task pools offer a high degree of flexibility regarding the number and kind of tasks that run within them, by providing methods to easily start and stop tasks and task groups. But without additional tools, they only allow you to establish a control logic *a priori*, as demonstrated in :ref:`this code snippet <simple-control-logic>`.
-
-What if you have a long-running program that executes certain tasks concurrently, but you don't know in advance how many of them you'll need? What if you want to be able to adjust the number of tasks manually **without stopping the task pool**?
-
-The control server
------------------
-
-The :code:`asyncio-taskpool` library comes with a simple control interface for managing task pools that are already running, at the heart of which is the :py:class:`ControlServer <asyncio_taskpool.control.server.ControlServer>`. Any task pool can be passed to a control server. Once the server is running, you can issue commands to it either via TCP or via UNIX socket. The commands map directly to the task pool methods.
-
-To enable control over a :py:class:`SimpleTaskPool <asyncio_taskpool.pool.SimpleTaskPool>` via local TCP port :code:`8001`, all you need to do is this:
-
-.. code-block:: python
-   :caption: main.py
-   :name: control-server-minimal
-
-   from asyncio_taskpool import SimpleTaskPool
-   from asyncio_taskpool.control import TCPControlServer
-   from .work import any_worker_func
-
-
-   async def main():
-       ...
-       pool = SimpleTaskPool(any_worker_func, kwargs={'foo': 42, 'bar': some_object})
-       control = await TCPControlServer(pool, host='127.0.0.1', port=8001).serve_forever()
-       await control
-
-Under the hood, the :py:class:`ControlServer <asyncio_taskpool.control.server.ControlServer>` simply uses :code:`asyncio.start_server` for instantiating a socket server. The resulting control task will run indefinitely. Cancelling the control task stops the server.
-
-In reality, you would probably want some graceful handler for an interrupt signal that cancels any remaining tasks as well as the serving control task.
-
-The control client
------------------
-
-Technically, any process that can read from and write to the socket exposed by the control server, will be able to interact with it. The :code:`asyncio-taskpool` package has its own simple implementation in the form of the :py:class:`ControlClient <asyncio_taskpool.control.client.ControlClient>` that makes it easy to use out of the box.
-
-To start a client, you can use the main script of the :py:mod:`asyncio_taskpool.control` sub-package like this:
-
-.. code-block:: bash
-
-   $ python -m asyncio_taskpool.control tcp localhost 8001
-
-This would establish a connection to the control server from the previous example. Calling
-
-.. code-block:: bash
-
-   $ python -m asyncio_taskpool.control -h
-
-will display the available client options.
-
-The control session
-------------------
-
-Assuming you connected successfully, you should be greeted by the server with a help message and dropped into a simple input prompt.
-
-.. code-block:: none
-
-   Connected to SimpleTaskPool-0
-   Type '-h' to get help and usage instructions for all available commands.
-
-   >
-
-The input sent to the server is handled by a typical argument parser, so the interface should be straight-forward. A command like
-
-.. code-block:: none
-
-   > start 5
-
-will call the :py:meth:`.start() <asyncio_taskpool.pool.SimpleTaskPool.start>` method with :code:`5` as an argument and thus start 5 new tasks in the pool, while the command
-
-.. code-block:: none
-
-   > pool-size
-
-will call the :py:meth:`.pool_size <asyncio_taskpool.pool.BaseTaskPool.pool_size>` property getter and return the maximum number of tasks you that can run in the pool.
-
-When you are dealing with a regular :py:class:`TaskPool <asyncio_taskpool.pool.TaskPool>` instance, starting new tasks works just fine, as long as the coroutine functions you want to use can be imported into the namespace of the pool. If you have a function named :code:`worker` in the module :code:`mymodule` under the package :code:`mypackage` and want to use it in a :py:meth:`.map() <asyncio_taskpool.pool.TaskPool.map>` call with the arguments :code:`'x'`, :code:`'x'`, and :code:`'z'`, you would do it like this:
-
-.. code-block:: none
-
-   > map mypackage.mymodule.worker ['x','y','z'] -n 3
-
-The :code:`-n` is a shorthand for :code:`--num-concurrent` in this case. In general, all (public) pool methods will have a corresponding command in the control session.
-
-.. note::
-
-   The :code:`ast.literal_eval` function from the `standard library <https://docs.python.org/3/library/ast.html#ast.literal_eval>`_ is used to safely evaluate the iterable of arguments to work on. For obvious reasons, being able to provide arbitrary python objects in such a control session is neither practical nor secure. The way this is implemented now is limited in that regard, since you can only use Python literals and containers as arguments for your coroutine functions.
-
-To exit a control session, use the :code:`exit` command or simply press :code:`Ctrl + D`.
--- a/docs/source/pages/ids.rst
+++ b/docs/source/pages/ids.rst
@ -1,42 +0,0 @@
-.. This file is part of asyncio-taskpool.
-
-.. asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-   version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-.. asyncio-taskpool 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 Lesser General Public License for more details.
-
-.. You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool.
-   If not, see <https://www.gnu.org/licenses/>.
-
-.. Copyright © 2022 Daniil Fajnberg
-
-
-IDs, groups & names
-===================
-
-Task IDs
--------
-
-Every task spawned within a pool receives an ID, which is an integer greater or equal to 0 that is unique **within that task pool instance**. An internal counter is incremented whenever a new task is spawned. A task with ID :code:`n` was the :code:`(n+1)`-th task to be spawned in the pool. Task IDs can be used to cancel specific tasks using the :py:meth:`.cancel() <asyncio_taskpool.pool.BaseTaskPool.cancel>` method.
-
-In practice, it should rarely be necessary to target *specific* tasks. When dealing with a regular :py:class:`TaskPool <asyncio_taskpool.pool.TaskPool>` instance, you would typically cancel entire task groups (see below) rather than individual tasks, whereas with :py:class:`SimpleTaskPool <asyncio_taskpool.pool.SimpleTaskPool>` instances you would indiscriminately cancel a number of tasks using the :py:meth:`.stop() <asyncio_taskpool.pool.SimpleTaskPool.stop>` method.
-
-The ID of a pool task also appears in the task's name, which is set upon spawning it. (See `here <https://docs.python.org/3/library/asyncio-task.html#asyncio.Task.set_name>`_ for the associated method of the :code:`Task` class.)
-
-Task groups
-----------
-
-Every method of spawning new tasks in a task pool will add them to a **task group** and return the name of that group. With :py:class:`TaskPool <asyncio_taskpool.pool.TaskPool>` methods such as :py:meth:`.apply() <asyncio_taskpool.pool.TaskPool.apply>` and :py:meth:`.map() <asyncio_taskpool.pool.TaskPool.map>`, the group name can be set explicitly via the :code:`group_name` parameter. By default, the name will be a string containing some meta information depending on which method is used. Passing an existing task group name in any of those methods will result in a :py:class:`InvalidGroupName <asyncio_taskpool.exceptions.InvalidGroupName>` error.
-
-You can cancel entire task groups using the :py:meth:`.cancel_group() <asyncio_taskpool.pool.BaseTaskPool.cancel_group>` method by passing it the group name. To check which tasks belong to a group, the :py:meth:`.get_group_ids() <asyncio_taskpool.pool.BaseTaskPool.get_group_ids>` method can be used, which takes group names and returns the IDs of the tasks belonging to them.
-
-The :py:meth:`SimpleTaskPool.start() <asyncio_taskpool.pool.SimpleTaskPool.start>` method will create a new group as well, each time it is called, but it does not allow customizing the group name. Typically, it will not be necessary to keep track of groups in a :py:class:`SimpleTaskPool <asyncio_taskpool.pool.SimpleTaskPool>` instance.
-
-Task groups do not impose limits on the number of tasks in them, although they can be indirectly constrained by pool size limits.
-
-Pool names
----------
-
-When initializing a task pool, you can provide a custom name for it, which will appear in its string representation, e.g. when using it in a :code:`print()`. A class attribute keeps track of initialized task pools and assigns each one an index (similar to IDs for pool tasks). If no name is specified when creating a new pool, its index is used in the string representation of it. Pool names can be helpful when using multiple pools and analyzing log messages.
--- a/docs/source/pages/pool.rst
+++ b/docs/source/pages/pool.rst
@ -1,233 +0,0 @@
-.. This file is part of asyncio-taskpool.
-
-.. asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-   version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-.. asyncio-taskpool 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 Lesser General Public License for more details.
-
-.. You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool.
-   If not, see <https://www.gnu.org/licenses/>.
-
-.. Copyright © 2022 Daniil Fajnberg
-
-
-Task pools
-==========
-
-What is a task pool?
--------------------
-
-A task pool is an object with a simple interface for aggregating and dynamically managing asynchronous tasks.
-
-To make use of task pools, your code obviously needs to contain coroutine functions (introduced with the :code:`async def` keywords). By adding such functions along with their arguments to a task pool, they are turned into tasks and executed asynchronously.
-
-If you are familiar with the :code:`Pool` class of the `multiprocessing module <https://docs.python.org/3/library/multiprocessing.html#module-multiprocessing.pool>`_ from the standard library, then you should feel at home with the :py:class:`TaskPool <asyncio_taskpool.pool.TaskPool>` class. Obviously, there are major conceptual and functional differences between the two, but the methods provided by the :py:class:`TaskPool <asyncio_taskpool.pool.TaskPool>` follow a very similar logic. If you never worked with process or thread pools, don't worry. Task pools are much simpler.
-
-The :code:`TaskPool` class
--------------------------
-
-There are essentially two distinct use cases for a concurrency pool. You want to
-
-#. execute a function *n* times with the same arguments concurrently or
-#. execute a function *n* times with different arguments concurrently.
-
-The first is accomplished with the :py:meth:`TaskPool.apply() <asyncio_taskpool.pool.TaskPool.apply>` method, while the second is accomplished with the :py:meth:`TaskPool.map() <asyncio_taskpool.pool.TaskPool.map>` method and its variations :py:meth:`.starmap() <asyncio_taskpool.pool.TaskPool.starmap>` and :py:meth:`.doublestarmap() <asyncio_taskpool.pool.TaskPool.doublestarmap>`.
-
-Let's take a look at an example. Say you have a coroutine function that takes two queues as arguments: The first one being an input-queue (containing items to work on) and the second one being the output queue (for passing on the results to some other function). Your function may look something like this:
-
-.. code-block:: python
-   :caption: work.py
-   :name: queue-worker-function
-
-   from asyncio.queues import Queue
-
-   async def queue_worker_function(in_queue: Queue, out_queue: Queue) -> None:
-       while True:
-           item = await in_queue.get()
-           ... # Do some work on the item and arrive at a result.
-           await out_queue.put(result)
-
-How would we go about concurrently executing this function, say 5 times? There are (as always) a number of ways to do this with :code:`asyncio`. If we want to use tasks and be clean about it, we can do it like this:
-
-.. code-block:: python
-   :caption: main.py
-
-   from asyncio.tasks import create_task, gather
-   from .work import queue_worker_function
-
-   ...
-   # We assume that the queues have been initialized already.
-   tasks = []
-   for _ in range(5):
-       new_task = create_task(queue_worker_function(q_in, q_out))
-       tasks.append(new_task)
-   # Run some other code and let the tasks do their thing.
-   ...
-   # At some point, we want the tasks to stop waiting for new items and end.
-   for task in tasks:
-       task.cancel()
-   ...
-   await gather(*tasks)
-
-By contrast, here is how you would do it with a task pool:
-
-.. code-block:: python
-   :caption: main.py
-
-   from asyncio_taskpool import TaskPool
-   from .work import queue_worker_function
-
-   ...
-   pool = TaskPool()
-   group_name = pool.apply(queue_worker_function, args=(q_in, q_out), num=5)
-   ...
-   pool.cancel_group(group_name)
-   ...
-   await pool.flush()
-
-Pretty much self-explanatory, no? (See :doc:`here <./ids>` for more information about groups/names).
-
-Let's consider a slightly more involved example. Assume you have a coroutine function that takes just one argument (some data) as input, does some work with it (maybe connects to the internet in the process), and eventually writes its results to a database (which is globally defined). Here is how that might look:
-
-.. code-block:: python
-   :caption: work.py
-   :name: another-worker-function
-
-   from .my_database_stuff import insert_into_results_table
-
-   async def another_worker_function(data: object) -> None:
-       if data.some_attribute > 1:
-           ...
-       # Do the work, arrive at results.
-       await insert_into_results_table(results)
-
-Say we have some *iterator* of data-items (of arbitrary length) that we want to be worked on, and say we want 5 coroutines concurrently working on that data. Here is a very naive task-based solution:
-
-.. code-block:: python
-   :caption: main.py
-
-   from asyncio.tasks import create_task, gather
-   from .work import another_worker_function
-
-   async def main():
-       ...
-       # We got our data_iterator from somewhere.
-       keep_going = True
-       while keep_going:
-           tasks = []
-           for _ in range(5):
-               try:
-                   data = next(data_iterator)
-               except StopIteration:
-                   keep_going = False
-                   break
-               new_task = create_task(another_worker_function(data))
-               tasks.append(new_task)
-           await gather(*tasks)
-
-Here we already run into problems with the task-based approach. The last line in our :code:`while`-loop blocks until **all 5 tasks** return (or raise an exception). This means that as soon as one of them returns, the number of working coroutines is already less than 5 (until all the others return). This can obviously be solved in different ways. We could, for instance, wrap the creation of new tasks itself in a coroutine, which immediately creates a new task, when one is finished, and then call that coroutine 5 times concurrently. Or we could use the queue-based approach from before, but then we would need to write some queue producing coroutine.
-
-Or we could use a task pool:
-
-.. code-block:: python
-   :caption: main.py
-
-   from asyncio_taskpool import TaskPool
-   from .work import another_worker_function
-
-
-   async def main():
-       ...
-       pool = TaskPool()
-       pool.map(another_worker_function, data_iterator, num_concurrent=5)
-       ...
-       await pool.gather_and_close()
-
-Calling the :py:meth:`.map() <asyncio_taskpool.pool.TaskPool.map>` method this way ensures that there will **always**  -- i.e. at any given moment in time -- be exactly 5 tasks working concurrently on our data (assuming no other pool interaction).
-
-The :py:meth:`.gather_and_close() <asyncio_taskpool.pool.BaseTaskPool.gather_and_close>` line will block until **all the data** has been consumed. (see :ref:`blocking-pool-methods`)
-
-.. note::
-
-   Neither :py:meth:`.apply() <asyncio_taskpool.pool.TaskPool.apply>` nor :py:meth:`.map() <asyncio_taskpool.pool.TaskPool.map>` return coroutines. When they are called, the task pool immediately begins scheduling new tasks to run. No :code:`await` needed.
-
-It can't get any simpler than that, can it? So glad you asked...
-
-The :code:`SimpleTaskPool` class
--------------------------------
-
-Let's take the :ref:`queue worker example <queue-worker-function>` from before. If we know that the task pool will only ever work with that one function with the same queue objects, we can make use of the :py:class:`SimpleTaskPool <asyncio_taskpool.pool.SimpleTaskPool>` class:
-
-.. code-block:: python
-   :caption: main.py
-
-   from asyncio_taskpool import SimpleTaskPool
-   from .work import queue_worker_function
-
-
-   async def main():
-       ...
-       pool = SimpleTaskPool(queue_worker_function, args=(q_in, q_out))
-       pool.start(5)
-       ...
-       pool.stop_all()
-       ...
-       await pool.gather_and_close()
-
-This may, at first glance, not seem like much of a difference, aside from different method names. However, assume that our main function runs a loop and needs to be able to periodically regulate the number of tasks being executed in the pool based on some additional variables it receives. With the :py:class:`SimpleTaskPool <asyncio_taskpool.pool.SimpleTaskPool>`, this could not be simpler:
-
-.. code-block:: python
-   :caption: main.py
-   :name: simple-control-logic
-
-   from asyncio_taskpool import SimpleTaskPool
-   from .work import queue_worker_function
-
-
-   async def main():
-       ...
-       pool = SimpleTaskPool(queue_worker_function, args=(q_in, q_out))
-       await pool.start(5)
-       while True:
-          ...
-          if some_condition and pool.num_running > 10:
-              pool.stop(3)
-          elif some_other_condition and pool.num_running < 5:
-              pool.start(5)
-          else:
-              pool.start(1)
-          ...
-       await pool.gather_and_close()
-
-Notice how we only specify the function and its arguments during initialization of the pool. From that point on, all we need is the :py:meth:`.start() <asyncio_taskpool.pool.SimpleTaskPool.start>` add :py:meth:`.stop() <asyncio_taskpool.pool.SimpleTaskPool.stop>` methods to adjust the number of concurrently running tasks.
-
-The trade-off here is that this simplified task pool class lacks the flexibility of the regular :py:class:`TaskPool <asyncio_taskpool.pool.TaskPool>` class. On an instance of the latter we can call :py:meth:`.map() <asyncio_taskpool.pool.TaskPool.map>` and :py:meth:`.apply() <asyncio_taskpool.pool.TaskPool.apply>` as often as we like with completely unrelated functions and arguments. With a :py:class:`SimpleTaskPool <asyncio_taskpool.pool.SimpleTaskPool>`, once you initialize it, it is pegged to one function and one set of arguments, and all you can do is control the number of tasks working with those.
-
-This simplified interface becomes particularly useful in conjunction with the :doc:`control server <./control>`.
-
-.. _blocking-pool-methods:
-
-(Non-)Blocking pool methods
---------------------------
-
-One of the main concerns when dealing with concurrent programs in general and with :code:`async` functions in particular is when and how a particular piece of code **blocks** during execution, i.e. delays the execution of the following code significantly.
-
-.. note::
-
-   Every statement will block to *some* extent. Obviously, when a program does something, that takes time. This is why the proper question to ask is not *if* but *to what extent, under which circumstances* the execution of a particular line of code blocks.
-
-It is fair to assume that anyone reading this is familiar enough with the concepts of asynchronous programming in Python to know that just slapping :code:`async` in front of a function definition will not magically make it suitable for concurrent execution (in any meaningful way). Therefore, we assume that you are dealing with coroutines that can actually unblock the `event loop  <https://docs.python.org/3/library/asyncio-eventloop.html>`_ (e.g. doing a significant amount of I/O).
-
-So how does the task pool behave in that regard?
-
-The only method of a pool that one should **always** assume to be blocking is :py:meth:`.gather_and_close() <asyncio_taskpool.pool.BaseTaskPool.gather_and_close>`. This method awaits **all** tasks in the pool, meaning as long as one of them is still running, this coroutine will not return.
-
-.. warning::
-
-   This includes awaiting any callbacks that were passed along with the tasks.
-
-One method to be aware of is :py:meth:`.flush() <asyncio_taskpool.pool.BaseTaskPool.flush>`. Since it will await only those tasks that the pool considers **ended** or **cancelled**, the blocking can only come from any callbacks that were provided for either of those situations.
-
-All methods that add tasks to a pool, i.e. :py:meth:`TaskPool.map() <asyncio_taskpool.pool.TaskPool.map>` (and its variants), :py:meth:`TaskPool.apply() <asyncio_taskpool.pool.TaskPool.apply>` and :py:meth:`SimpleTaskPool.start() <asyncio_taskpool.pool.SimpleTaskPool.start>`, are non-blocking by design. They all make use of "meta tasks" under the hood and return immediately. It is important however, to realize that just because they return, does not mean that any actual tasks have been spawned. For example, if a pool size limit was set and there was "no more room" in the pool when :py:meth:`.map() <asyncio_taskpool.pool.TaskPool.map>` was called, there is **no guarantee** that even a single task has started, when it returns.
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@ -1,4 +1,2 @@
 -r common.txt
 coverage
-sphinx
-sphinx-rtd-theme
--- a/setup.cfg
+++ b/setup.cfg
@ -1,6 +1,6 @@
 [metadata]
 name = asyncio-taskpool
-version = 1.1.4
+version = 0.4.0
 author = Daniil Fajnberg
 author_email = mail@daniil.fajnberg.de
 description = Dynamically manage pools of asyncio tasks
@ -9,9 +9,9 @@ long_description_content_type = text/markdown
 keywords = asyncio, concurrency, tasks, coroutines, asynchronous, server
 url = https://git.fajnberg.de/daniil/asyncio-taskpool
 project_urls =
-    Bug Tracker = https://github.com/daniil-berg/asyncio-taskpool/issues
+    Bug Tracker = https://git.fajnberg.de/daniil/asyncio-taskpool/issues
 classifiers =
-    Development Status :: 5 - Production/Stable
+    Development Status :: 3 - Alpha
    Programming Language :: Python :: 3
    Operating System :: OS Independent
    License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)
@ -30,8 +30,6 @@ python_requires = >=3.8
 [options.extras_require]
 dev =
    coverage
-    sphinx
-    sphinx-rtd-theme

 [options.packages.find]
 where = src
--- a/src/asyncio_taskpool/init.py
+++ b/src/asyncio_taskpool/init.py
@ -14,5 +14,10 @@ See the GNU Lesser General Public License for more details.
 You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
 If not, see <https://www.gnu.org/licenses/>."""

+__doc__ = """
+Brings the main classes up to package level for import convenience.
+"""
+

 from .pool import TaskPool, SimpleTaskPool
+from .server import UnixControlServer
--- a/src/asyncio_taskpool/main.py
+++ b/src/asyncio_taskpool/main.py
@ -0,0 +1,67 @@
+__author__ = "Daniil Fajnberg"
+__copyright__ = "Copyright © 2022 Daniil Fajnberg"
+__license__ = """GNU LGPLv3.0
+
+This file is part of asyncio-taskpool.
+
+asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
+version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
+
+asyncio-taskpool 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
+If not, see <https://www.gnu.org/licenses/>."""
+
+__doc__ = """
+CLI client entry point.
+"""
+
+
+import sys
+from argparse import ArgumentParser
+from asyncio import run
+from pathlib import Path
+from typing import Dict, Any
+
+from .client import ControlClient, UnixControlClient
+from .constants import PACKAGE_NAME
+from .pool import TaskPool
+from .server import ControlServer
+
+
+CONN_TYPE = 'conn_type'
+UNIX, TCP = 'unix', 'tcp'
+SOCKET_PATH = 'path'
+
+
+def parse_cli() -> Dict[str, Any]:
+    parser = ArgumentParser(
+        prog=PACKAGE_NAME,
+        description=f"CLI based {ControlClient.__name__} for {PACKAGE_NAME}"
+    )
+    subparsers = parser.add_subparsers(title="Connection types", dest=CONN_TYPE)
+    unix_parser = subparsers.add_parser(UNIX, help="Connect via unix socket")
+    unix_parser.add_argument(
+        SOCKET_PATH,
+        type=Path,
+        help=f"Path to the unix socket on which the {ControlServer.__name__} for the {TaskPool.__name__} is listening."
+    )
+    return vars(parser.parse_args())
+
+
+async def main():
+    kwargs = parse_cli()
+    if kwargs[CONN_TYPE] == UNIX:
+        client = UnixControlClient(socket_path=kwargs[SOCKET_PATH])
+    elif kwargs[CONN_TYPE] == TCP:
+        # TODO: Implement the TCP client class
+        client = UnixControlClient(socket_path=kwargs[SOCKET_PATH])
+    else:
+        print("Invalid connection type", file=sys.stderr)
+        sys.exit(2)
+    await client.start()
+
+if __name__ == '__main__':
+    run(main())
--- a/src/asyncio_taskpool/control/client.py
+++ b/src/asyncio_taskpool/control/client.py
@ -23,28 +23,17 @@ import json
 import shutil
 import sys
 from abc import ABC, abstractmethod
-from asyncio.streams import StreamReader, StreamWriter, open_connection
+from asyncio.streams import StreamReader, StreamWriter, open_unix_connection
 from pathlib import Path
-from typing import Optional, Union
+from typing import Optional

-from ..internals.constants import CLIENT_INFO, SESSION_MSG_BYTES
-from ..internals.types import ClientConnT, PathT
-
-
-__all__ = [
-    'ControlClient',
-    'TCPControlClient',
-    'UnixControlClient',
-    'CLIENT_EXIT'
-]
-
-
-CLIENT_EXIT = 'exit'
+from .constants import CLIENT_EXIT, CLIENT_INFO, SESSION_MSG_BYTES
+from .types import ClientConnT, PathT


 class ControlClient(ABC):
    """
-    Abstract base class for a simple implementation of a pool control client.
+    Abstract base class for a simple implementation of a task pool control client.

    Since the server's control interface is simply expecting commands to be sent, any process able to connect to the
    TCP or UNIX socket and issue the relevant commands (and optionally read the responses) will work just as well.
@ -52,7 +41,7 @@ class ControlClient(ABC):
    """

    @staticmethod
-    def _client_info() -> dict:
+    def client_info() -> dict:
        """Returns a dictionary of client information relevant for the handshake with the server."""
        return {CLIENT_INFO.TERMINAL_WIDTH: shutil.get_terminal_size().columns}

@ -61,15 +50,15 @@ class ControlClient(ABC):
        """
        Tries to connect to a socket using the provided arguments and return the associated reader-writer-pair.

-        This method will be invoked by the public `start()` method with the pre-defined internal `_conn_kwargs`
-        (unpacked) as keyword-arguments.
+        This method will be invoked by the public `start()` method with the pre-defined internal `_conn_kwargs` (unpacked)
+        as keyword-arguments.
        This method should return either a tuple of `asyncio.StreamReader` and `asyncio.StreamWriter` or a tuple of
        `None` and `None`, if it failed to establish the defined connection.
        """
        raise NotImplementedError

    def __init__(self, **conn_kwargs) -> None:
-        """Simply stores the keyword-arguments for opening the connection."""
+        """Simply stores the connection keyword-arguments necessary for opening the connection."""
        self._conn_kwargs = conn_kwargs
        self._connected: bool = False

@ -84,11 +73,9 @@ class ControlClient(ABC):
            writer: The `asyncio.StreamWriter` returned by the `_open_connection()` method
        """
        self._connected = True
-        writer.write(json.dumps(self._client_info()).encode())
-        writer.write(b'\n')
+        writer.write(json.dumps(self.client_info()).encode())
        await writer.drain()
        print("Connected to", (await reader.read(SESSION_MSG_BYTES)).decode())
-        print("Type '-h' to get help and usage instructions for all available commands.\n")

    def _get_command(self, writer: StreamWriter) -> Optional[str]:
        """
@ -98,22 +85,21 @@ class ControlClient(ABC):
            writer: The `asyncio.StreamWriter` returned by the `_open_connection()` method

        Returns:
-            `None`, if either `Ctrl+C` was hit, an empty or whitespace-only string was entered, or the user wants the
-            client to disconnect; otherwise, returns the user's input, stripped of leading and trailing spaces and
-            converted to lowercase.
+            `None`, if either `Ctrl+C` was hit, or the user wants the client to disconnect;
+            otherwise, the user's input, stripped of leading and trailing spaces and converted to lowercase.
        """
        try:
-            cmd = input("> ").strip().lower()
-        except EOFError:  # Ctrl+D shall be equivalent to the :const:`CLIENT_EXIT` command.
-            cmd = CLIENT_EXIT
+            msg = input("> ").strip().lower()
+        except EOFError:  # Ctrl+D shall be equivalent to the `CLIENT_EXIT` command.
+            msg = CLIENT_EXIT
        except KeyboardInterrupt:  # Ctrl+C shall simply reset to the input prompt.
            print()
            return
-        if cmd == CLIENT_EXIT:
+        if msg == CLIENT_EXIT:
            writer.close()
            self._connected = False
            return
-        return cmd or None  # will be None if `cmd` is an empty string
+        return msg

    async def _interact(self, reader: StreamReader, writer: StreamWriter) -> None:
        """
@ -132,7 +118,6 @@ class ControlClient(ABC):
        try:
            # Send the command to the server.
            writer.write(cmd.encode())
-            writer.write(b'\n')
            await writer.drain()
        except ConnectionError as e:
            self._connected = False
@ -143,14 +128,11 @@ class ControlClient(ABC):

    async def start(self) -> None:
        """
-        Opens connection, performs handshake, and enters interaction loop.
-
-        An input prompt is presented to the user and any input is sent (encoded) to the connected server.
-        One exception is the :const:`CLIENT_EXIT` command (equivalent to Ctrl+D), which merely closes the connection.
+        This method opens the pre-defined connection, performs the server-handshake, and enters the interaction loop.

        If the connection can not be established, an error message is printed to `stderr` and the method returns.
-        If either the exit command is issued or the connection to the server is lost during the interaction loop,
-        the method returns and prints out a disconnected-message.
+        If the `_connected` flag is set to `False` during the interaction loop, the method returns and prints out a
+        disconnected-message.
        """
        reader, writer = await self._open_connection(**self._conn_kwargs)
        if reader is None:
@ -162,36 +144,15 @@ class ControlClient(ABC):
        print("Disconnected from control server.")


-class TCPControlClient(ControlClient):
-    """Task pool control client for connecting to a :class:`TCPControlServer`."""
-
-    def __init__(self, host: str, port: Union[int, str], **conn_kwargs) -> None:
-        """`host` and `port` are expected as non-optional connection arguments."""
-        self._host = host
-        self._port = port
-        super().__init__(**conn_kwargs)
-
-    async def _open_connection(self, **kwargs) -> ClientConnT:
-        """
-        Wrapper around the `asyncio.open_connection` function.
-
-        Returns a tuple of `None` and `None`, if the connection can not be established;
-        otherwise, the stream-reader and -writer tuple is returned.
-        """
-        try:
-            return await open_connection(self._host, self._port, **kwargs)
-        except ConnectionError as e:
-            print(str(e), file=sys.stderr)
-            return None, None
-
-
 class UnixControlClient(ControlClient):
-    """Task pool control client for connecting to a :class:`UnixControlServer`."""
+    """Task pool control client that expects a unix socket to be exposed by the control server."""

    def __init__(self, socket_path: PathT, **conn_kwargs) -> None:
-        """`socket_path` is expected as a non-optional connection argument."""
-        from asyncio.streams import open_unix_connection
-        self._open_unix_connection = open_unix_connection
+        """
+        In addition to what the base class does, the `socket_path` is expected as a non-optional argument.
+
+        The `_socket_path` attribute is set to the `Path` object created from the `socket_path` argument.
+        """
        self._socket_path = Path(socket_path)
        super().__init__(**conn_kwargs)

@ -203,7 +164,7 @@ class UnixControlClient(ControlClient):
        otherwise, the stream-reader and -writer tuple is returned.
        """
        try:
-            return await self._open_unix_connection(self._socket_path, **kwargs)
+            return await open_unix_connection(self._socket_path, **kwargs)
        except FileNotFoundError:
            print("No socket at", self._socket_path, file=sys.stderr)
            return None, None
--- a/src/asyncio_taskpool/internals/constants.py
+++ b/src/asyncio_taskpool/internals/constants.py
@ -16,26 +16,32 @@ If not, see <https://www.gnu.org/licenses/>."""

 __doc__ = """
 Constants used by more than one module in the package.
-
-This module should **not** be considered part of the public API.
 """


-import sys
-
-
 PACKAGE_NAME = 'asyncio_taskpool'

-PYTHON_BEFORE_39 = sys.version_info[:2] < (3, 9)
+DEFAULT_TASK_GROUP = ''
+DATETIME_FORMAT = '%Y-%m-%d_%H-%M-%S'

-DEFAULT_TASK_GROUP = 'default'
+CLIENT_EXIT = 'exit'

 SESSION_MSG_BYTES = 1024 * 100
-
-CMD = 'command'
-CMD_OK = b"ok"
+SESSION_WRITER = 'session_writer'


 class CLIENT_INFO:
    __slots__ = ()
    TERMINAL_WIDTH = 'terminal_width'
+
+
+class CMD:
+    __slots__ = ()
+    CMD = 'command'
+    NAME = 'name'
+    POOL_SIZE = 'pool-size'
+    NUM_RUNNING = 'num-running'
+    START = 'start'
+    STOP = 'stop'
+    STOP_ALL = 'stop-all'
+    FUNC_NAME = 'func-name'
--- a/src/asyncio_taskpool/control/init.py
+++ b/src/asyncio_taskpool/control/init.py
@ -1,2 +0,0 @@
-from .server import TCPControlServer, UnixControlServer
-from .client import TCPControlClient, UnixControlClient
--- a/src/asyncio_taskpool/control/main.py
+++ b/src/asyncio_taskpool/control/main.py
@ -1,80 +0,0 @@
-__author__ = "Daniil Fajnberg"
-__copyright__ = "Copyright © 2022 Daniil Fajnberg"
-__license__ = """GNU LGPLv3.0
-
-This file is part of asyncio-taskpool.
-
-asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-asyncio-taskpool 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 Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
-If not, see <https://www.gnu.org/licenses/>."""
-
-__doc__ = """
-CLI entry point script for a :class:`ControlClient`.
-"""
-
-
-from argparse import ArgumentParser
-from asyncio import run
-from pathlib import Path
-from typing import Any, Dict, Sequence
-
-from ..internals.constants import PACKAGE_NAME
-from ..pool import TaskPool
-from .client import TCPControlClient, UnixControlClient
-from .server import TCPControlServer, UnixControlServer
-
-
-__all__ = []
-
-
-CLIENT_CLASS = 'client_class'
-UNIX, TCP = 'unix', 'tcp'
-SOCKET_PATH = 'socket_path'
-HOST, PORT = 'host', 'port'
-
-
-def parse_cli(args: Sequence[str] = None) -> Dict[str, Any]:
-    parser = ArgumentParser(
-        prog=f'{PACKAGE_NAME}.control',
-        description=f"Simple CLI based control client for {PACKAGE_NAME}"
-    )
-    subparsers = parser.add_subparsers(title="Connection types")
-
-    tcp_parser = subparsers.add_parser(TCP, help="Connect via TCP socket")
-    tcp_parser.add_argument(
-        HOST,
-        help=f"IP address or url that the {TCPControlServer.__name__} for the {TaskPool.__name__} is listening on."
-    )
-    tcp_parser.add_argument(
-        PORT,
-        type=int,
-        help=f"Port that the {TCPControlServer.__name__} for the {TaskPool.__name__} is listening on."
-    )
-    tcp_parser.set_defaults(**{CLIENT_CLASS: TCPControlClient})
-
-    unix_parser = subparsers.add_parser(UNIX, help="Connect via unix socket")
-    unix_parser.add_argument(
-        SOCKET_PATH,
-        type=Path,
-        help=f"Path to the unix socket on which the {UnixControlServer.__name__} for the {TaskPool.__name__} is "
-             f"listening."
-    )
-    unix_parser.set_defaults(**{CLIENT_CLASS: UnixControlClient})
-
-    return vars(parser.parse_args(args))
-
-
-async def main():
-    kwargs = parse_cli()
-    client_cls = kwargs.pop(CLIENT_CLASS)
-    await client_cls(**kwargs).start()
-
-
-if __name__ == '__main__':
-    run(main())
--- a/src/asyncio_taskpool/control/parser.py
+++ b/src/asyncio_taskpool/control/parser.py
@ -1,342 +0,0 @@
-__author__ = "Daniil Fajnberg"
-__copyright__ = "Copyright © 2022 Daniil Fajnberg"
-__license__ = """GNU LGPLv3.0
-
-This file is part of asyncio-taskpool.
-
-asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-asyncio-taskpool 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 Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
-If not, see <https://www.gnu.org/licenses/>."""
-
-__doc__ = """
-Definition of the :class:`ControlParser` used in a 
-:class:`ControlSession <asyncio_taskpool.control.session.ControlSession>`.
-
-It should not be considered part of the public API.
-"""
-
-
-import logging
-from argparse import Action, ArgumentParser, ArgumentDefaultsHelpFormatter, HelpFormatter, ArgumentTypeError, SUPPRESS
-from ast import literal_eval
-from inspect import Parameter, getmembers, isfunction, signature
-from io import StringIO
-from shutil import get_terminal_size
-from typing import Any, Callable, Container, Dict, Iterable, Set, Type, TypeVar
-
-from ..exceptions import HelpRequested, ParserError
-from ..internals.constants import CLIENT_INFO, CMD
-from ..internals.helpers import get_first_doc_line, resolve_dotted_path
-from ..internals.types import ArgsT, CancelCB, CoroutineFunc, EndCB, KwArgsT
-
-
-__all__ = ['ControlParser']
-
-
-log = logging.getLogger(__name__)
-
-
-FmtCls = TypeVar('FmtCls', bound=Type[HelpFormatter])
-ParsersDict = Dict[str, 'ControlParser']
-
-OMIT_PARAMS_DEFAULT = ('self', )
-
-NAME, PROG, HELP, DESCRIPTION = 'name', 'prog', 'help', 'description'
-
-
-class ControlParser(ArgumentParser):
-    """
-    Subclass of the standard :code:`argparse.ArgumentParser` for pool control.
-
-    Such a parser is not supposed to ever print to stdout/stderr, but instead direct all messages to a file-like
-    `StringIO` instance passed to it during initialization.
-    Furthermore, it requires defining the width of the terminal, to adjust help formatting to the terminal size of a
-    connected client.
-    Finally, it offers some convenience methods and makes use of custom exceptions.
-    """
-
-    @staticmethod
-    def help_formatter_factory(terminal_width: int, base_cls: FmtCls = None) -> FmtCls:
-        """
-        Constructs and returns a subclass of :class:`argparse.HelpFormatter`
-
-        The formatter class will have the defined `terminal_width`.
-
-        Although a custom formatter class can be explicitly passed into the :class:`ArgumentParser` constructor,
-        this is not as convenient, when making use of sub-parsers.
-
-        Args:
-            terminal_width:
-                The number of columns of the terminal to which to adjust help formatting.
-            base_cls (optional):
-                Base class to use for inheritance. By default :class:`argparse.ArgumentDefaultsHelpFormatter` is used.
-
-        Returns:
-            The subclass of `base_cls` which fixes the constructor's `width` keyword-argument to `terminal_width`.
-        """
-        if base_cls is None:
-            base_cls = ArgumentDefaultsHelpFormatter
-
-        class ClientHelpFormatter(base_cls):
-            def __init__(self, *args, **kwargs) -> None:
-                kwargs['width'] = terminal_width
-                super().__init__(*args, **kwargs)
-        return ClientHelpFormatter
-
-    def __init__(self, stream: StringIO, terminal_width: int = None, **kwargs) -> None:
-        """
-        Sets some internal attributes in addition to the base class.
-
-        Args:
-            stream:
-                A file-like I/O object to use for message output.
-            terminal_width (optional):
-                The terminal width to use for all message formatting. By default the :code:`columns` attribute from
-                :func:`shutil.get_terminal_size` is taken.
-            **kwargs(optional):
-                Passed to the parent class constructor. The exception is the `formatter_class` parameter: Even if a
-                class is specified, it will always be subclassed in the :meth:`help_formatter_factory`.
-        """
-        self._stream: StringIO = stream
-        self._terminal_width: int = terminal_width if terminal_width is not None else get_terminal_size().columns
-        kwargs['formatter_class'] = self.help_formatter_factory(self._terminal_width, kwargs.get('formatter_class'))
-        super().__init__(**kwargs)
-        self._flags: Set[str] = set()
-        self._commands = None
-
-    def add_function_command(self, function: Callable, omit_params: Container[str] = OMIT_PARAMS_DEFAULT,
-                             **subparser_kwargs) -> 'ControlParser':
-        """
-        Takes a function and adds a corresponding (sub-)command to the parser.
-
-        The :meth:`add_subparsers` method must have been called prior to this.
-
-        NOTE: Currently, only a limited spectrum of parameters can be accurately converted to parser arguments.
-        This method works correctly with any public method of the any task pool class.
-
-        Args:
-            function:
-                The reference to the function to be "converted" to a parser command.
-            omit_params (optional):
-                Names of function parameters not to add as parser arguments.
-            **subparser_kwargs (optional):
-                Passed directly to the :meth:`add_parser` method.
-
-        Returns:
-            The subparser instance created from the function.
-        """
-        subparser_kwargs.setdefault(NAME, function.__name__.replace('_', '-'))
-        subparser_kwargs.setdefault(PROG, subparser_kwargs[NAME])
-        subparser_kwargs.setdefault(HELP, get_first_doc_line(function))
-        subparser_kwargs.setdefault(DESCRIPTION, subparser_kwargs[HELP])
-        subparser: ControlParser = self._commands.add_parser(**subparser_kwargs)
-        subparser.add_function_args(function, omit_params)
-        return subparser
-
-    def add_property_command(self, prop: property, cls_name: str = '', **subparser_kwargs) -> 'ControlParser':
-        """
-        Same as the :meth:`add_function_command` method, but for properties.
-
-        Args:
-            prop:
-                The reference to the property to be "converted" to a parser command.
-            cls_name (optional):
-                Name of the class the property is defined on to appear in the command help text.
-            **subparser_kwargs (optional):
-                Passed directly to the :meth:`add_parser` method.
-
-        Returns:
-            The subparser instance created from the property.
-        """
-        subparser_kwargs.setdefault(NAME, prop.fget.__name__.replace('_', '-'))
-        subparser_kwargs.setdefault(PROG, subparser_kwargs[NAME])
-        getter_help = get_first_doc_line(prop.fget)
-        if prop.fset is None:
-            subparser_kwargs.setdefault(HELP, getter_help)
-        else:
-            subparser_kwargs.setdefault(HELP, f"Get/set the `{cls_name}.{subparser_kwargs[NAME]}` property")
-        subparser_kwargs.setdefault(DESCRIPTION, subparser_kwargs[HELP])
-        subparser: ControlParser = self._commands.add_parser(**subparser_kwargs)
-        if prop.fset is not None:
-            _, param = signature(prop.fset).parameters.values()
-            setter_arg_help = f"If provided: {get_first_doc_line(prop.fset)} If omitted: {getter_help}"
-            subparser.add_function_arg(param, nargs='?', default=SUPPRESS, help=setter_arg_help)
-        return subparser
-
-    def add_class_commands(self, cls: Type, public_only: bool = True, omit_members: Container[str] = (),
-                           member_arg_name: str = CMD) -> ParsersDict:
-        """
-        Adds methods/properties of a class as (sub-)commands to the parser.
-
-        The :meth:`add_subparsers` method must have been called prior to this.
-
-        NOTE: Currently, only a limited spectrum of function parameters can be accurately converted to parser arguments.
-        This method works correctly with any task pool class.
-
-        Args:
-            cls:
-                The reference to the class whose methods/properties are to be "converted" to parser commands.
-            public_only (optional):
-                If `False`, protected and private members are considered as well. `True` by default.
-            omit_members (optional):
-                Names of functions/properties not to add as parser commands.
-            member_arg_name (optional):
-                After parsing the arguments, depending on which command was invoked by the user, the corresponding
-                method/property will be stored as an extra argument in the parsed namespace under this attribute name.
-
-        Returns:
-            Dictionary mapping class member names to the (sub-)parsers created from them.
-        """
-        parsers: ParsersDict = {}
-        common_kwargs = {'stream': self._stream, CLIENT_INFO.TERMINAL_WIDTH: self._terminal_width}
-        for name, member in getmembers(cls):
-            if name in omit_members or (name.startswith('_') and public_only):
-                continue
-            if isfunction(member):
-                subparser = self.add_function_command(member, **common_kwargs)
-            elif isinstance(member, property):
-                subparser = self.add_property_command(member, cls.__name__, **common_kwargs)
-            else:
-                continue
-            subparser.set_defaults(**{member_arg_name: member})
-            parsers[name] = subparser
-        return parsers
-
-    def add_subparsers(self, *args, **kwargs):
-        """Adds the subparsers action as an attribute before returning it."""
-        self._commands = super().add_subparsers(*args, **kwargs)
-        return self._commands
-
-    def _print_message(self, message: str, *args, **kwargs) -> None:
-        """This is overridden to ensure that no messages are sent to stdout/stderr, but always to the stream buffer."""
-        if message:
-            self._stream.write(message)
-
-    def exit(self, status: int = 0, message: str = None) -> None:
-        """This is overridden to prevent system exit to be invoked."""
-        if message:
-            self._print_message(message)
-
-    def error(self, message: str) -> None:
-        """Raises the :exc:`ParserError <asyncio_taskpool.exceptions.ParserError>` exception at the end."""
-        super().error(message=message)
-        raise ParserError
-
-    def print_help(self, file=None) -> None:
-        """Raises the :exc:`HelpRequested <asyncio_taskpool.exceptions.HelpRequested>` exception at the end."""
-        super().print_help(file)
-        raise HelpRequested
-
-    def add_function_arg(self, parameter: Parameter, **kwargs) -> Action:
-        """
-        Takes an :class:`inspect.Parameter` and adds a corresponding parser argument.
-
-        NOTE: Currently, only a limited spectrum of parameters can be accurately converted to a parser argument.
-        This method works correctly with any parameter of any public method any task pool class.
-
-        Args:
-            parameter: The :class:`inspect.Parameter` object to be converted to a parser argument.
-            **kwargs: Passed to the :meth:`add_argument` method of the base class.
-
-        Returns:
-            The :class:`argparse.Action` returned by the :meth:`add_argument` method.
-        """
-        if parameter.default is Parameter.empty:
-            # A non-optional function parameter should correspond to a positional argument.
-            name_or_flags = [parameter.name]
-        else:
-            flag = None
-            long = f'--{parameter.name.replace("_", "-")}'
-            # We try to generate a short version (flag) for the argument.
-            letter = parameter.name[0]
-            if letter not in self._flags:
-                flag = f'-{letter}'
-                self._flags.add(letter)
-            elif letter.upper() not in self._flags:
-                flag = f'-{letter.upper()}'
-                self._flags.add(letter.upper())
-            name_or_flags = [long] if flag is None else [flag, long]
-            if parameter.annotation is bool:
-                # If we are dealing with a boolean parameter, always use the 'store_true' action.
-                # Even if the parameter's default value is `True`, this will make the parser argument's default `False`.
-                kwargs.setdefault('action', 'store_true')
-            else:
-                # For now, any other type annotation will implicitly use the default action 'store'.
-                # In addition, we always set the default value.
-                kwargs.setdefault('default', parameter.default)
-        if parameter.kind == Parameter.VAR_POSITIONAL:
-            # This is to be able to later unpack an arbitrary number of positional arguments.
-            kwargs.setdefault('nargs', '*')
-        if not kwargs.get('action') == 'store_true':
-            # Set the type from the parameter annotation.
-            kwargs.setdefault('type', _get_type_from_annotation(parameter.annotation))
-        return self.add_argument(*name_or_flags, **kwargs)
-
-    def add_function_args(self, function: Callable, omit: Container[str] = OMIT_PARAMS_DEFAULT) -> None:
-        """
-        Takes a function and adds its parameters as arguments to the parser.
-
-        NOTE: Currently, only a limited spectrum of parameters can be accurately converted to a parser argument.
-        This method works correctly with any public method of any task pool class.
-
-        Args:
-            function:
-                The function whose parameters are to be converted to parser arguments.
-                Its parameters must be properly annotated.
-            omit (optional):
-                Names of function parameters not to add as parser arguments.
-        """
-        for param in signature(function).parameters.values():
-            if param.name not in omit:
-                # TODO: Look into parsing docstrings properly to try and extract argument help text.
-                #       For now, the argument help just shows the type it will be converted to.
-                self.add_function_arg(param, help=repr(param.annotation))
-
-
-def _get_arg_type_wrapper(cls: Type) -> Callable[[Any], Any]:
-    """
-    Returns a wrapper for the constructor of `cls` to avoid a ValueError being raised on suppressed arguments.
-
-    See: https://bugs.python.org/issue36078
-
-    In addition, the type conversion wrapper catches exceptions not handled properly by the parser, logs them, and
-    turns them into `ArgumentTypeError` exceptions the parser can propagate to the client.
-    """
-    def wrapper(arg: Any) -> Any:
-        if arg is SUPPRESS:
-            return arg
-        try:
-            return cls(arg)
-        except (ArgumentTypeError, TypeError, ValueError):
-            raise  # handled properly by the parser and propagated to the client anyway
-        except Exception as e:
-            text = f"{e.__class__.__name__} occurred in parser trying to convert type: {cls.__name__}({repr(arg)})"
-            log.exception(text)
-            raise ArgumentTypeError(text)  # propagate to the client
-    # Copy the name of the class to maintain useful help messages when incorrect arguments are passed.
-    wrapper.__name__ = cls.__name__
-    return wrapper
-
-
-def _get_type_from_annotation(annotation: Type) -> Callable[[Any], Any]:
-    """
-    Returns a type conversion function based on the `annotation` passed.
-
-    Required to properly convert parsed arguments to the type expected by certain pool methods.
-    Each conversion function is wrapped by `_get_arg_type_wrapper`.
-
-    `Callable`-type annotations give the `resolve_dotted_path` function.
-    `Iterable`- or args/kwargs-type annotations give the `ast.literal_eval` function.
-    Others pass unchanged (but still wrapped with `_get_arg_type_wrapper`).
-    """
-    if any(annotation is t for t in {CoroutineFunc, EndCB, CancelCB}):
-        annotation = resolve_dotted_path
-    if any(annotation is t for t in {ArgsT, KwArgsT, Iterable[ArgsT], Iterable[KwArgsT]}):
-        annotation = literal_eval
-    return _get_arg_type_wrapper(annotation)
--- a/src/asyncio_taskpool/control/session.py
+++ b/src/asyncio_taskpool/control/session.py
@ -1,200 +0,0 @@
-__author__ = "Daniil Fajnberg"
-__copyright__ = "Copyright © 2022 Daniil Fajnberg"
-__license__ = """GNU LGPLv3.0
-
-This file is part of asyncio-taskpool.
-
-asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-asyncio-taskpool 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 Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
-If not, see <https://www.gnu.org/licenses/>."""
-
-__doc__ = """
-Definition of the :class:`ControlSession` used by a :class:`ControlServer`.
-
-It should not be considered part of the public API.
-"""
-
-
-import logging
-import json
-from argparse import ArgumentError
-from asyncio.streams import StreamReader, StreamWriter
-from inspect import isfunction, signature
-from io import StringIO
-from typing import Callable, Optional, Union, TYPE_CHECKING
-
-from .parser import ControlParser
-from ..exceptions import CommandError, HelpRequested, ParserError
-from ..pool import TaskPool, SimpleTaskPool
-from ..internals.constants import CLIENT_INFO, CMD, CMD_OK
-from ..internals.helpers import return_or_exception
-
-if TYPE_CHECKING:
-    from .server import ControlServer
-
-
-__all__ = ['ControlSession']
-
-
-log = logging.getLogger(__name__)
-
-
-class ControlSession:
-    """
-    Manages a single control session between a server and a client.
-
-    The commands received from a connected client are translated into method calls on the task pool instance.
-    A subclass of the standard :class:`argparse.ArgumentParser` is used to handle the input read from the stream.
-    """
-
-    def __init__(self, server: 'ControlServer', reader: StreamReader, writer: StreamWriter) -> None:
-        """
-        Connection to the control server should already been established.
-
-        For more convenient/efficient access, some of the server's properties are saved in separate attributes.
-        The argument parser is _not_ instantiated in the constructor. It requires a bit of client information during
-        initialization, which is obtained in the `client_handshake` method; only there is the parser fully configured.
-
-        Args:
-            server:
-                The instance of a :class:`ControlServer` subclass starting the session.
-            reader:
-                The `asyncio.StreamReader` created when a client connected to the server.
-            writer:
-                The `asyncio.StreamWriter` created when a client connected to the server.
-        """
-        self._control_server: 'ControlServer' = server
-        self._pool: Union[TaskPool, SimpleTaskPool] = server.pool
-        self._client_class_name = server.client_class_name
-        self._reader: StreamReader = reader
-        self._writer: StreamWriter = writer
-        self._parser: Optional[ControlParser] = None
-        self._response_buffer: StringIO = StringIO()
-
-    async def _exec_method_and_respond(self, method: Callable, **kwargs) -> None:
-        """
-        Takes a pool method reference, executes it, and writes a response accordingly.
-
-        If the first parameter is named `self`, the method will be called with the `_pool` instance as its first
-        positional argument.
-        If it returns nothing, the response upon successful execution will be :const:`constants.CMD_OK`, otherwise the
-        response written to the stream will be its return value (as an encoded string).
-
-        Args:
-            prop:
-                The reference to the method defined on the `_pool` instance's class.
-            **kwargs (optional):
-                Must correspond to the arguments expected by the `method`.
-                Correctly unpacks arbitrary-length positional and keyword-arguments.
-        """
-        log.debug("%s calls %s.%s", self._client_class_name, self._pool.__class__.__name__, method.__name__)
-        normal_pos, var_pos = [], []
-        for param in signature(method).parameters.values():
-            if param.name == 'self':
-                normal_pos.append(self._pool)
-            elif param.kind in (param.POSITIONAL_OR_KEYWORD, param.POSITIONAL_ONLY):
-                normal_pos.append(kwargs.pop(param.name))
-            elif param.kind == param.VAR_POSITIONAL:
-                var_pos = kwargs.pop(param.name)
-        output = await return_or_exception(method, *normal_pos, *var_pos, **kwargs)
-        self._response_buffer.write(CMD_OK.decode() if output is None else str(output))
-
-    async def _exec_property_and_respond(self, prop: property, **kwargs) -> None:
-        """
-        Takes a pool property reference, executes its setter or getter, and writes a response accordingly.
-
-        The property set/get method will always be called with the `_pool` instance as its first positional argument.
-
-        Args:
-            prop:
-                The reference to the property defined on the `_pool` instance's class.
-            **kwargs (optional):
-                If not empty, the property setter is executed and the keyword arguments are passed along to it; the
-                response upon successful execution will be :const:`constants.CMD_OK`. Otherwise the property getter is
-                executed and the response written to the stream will be its return value (as an encoded string).
-        """
-        if kwargs:
-            log.debug("%s sets %s.%s", self._client_class_name, self._pool.__class__.__name__, prop.fset.__name__)
-            await return_or_exception(prop.fset, self._pool, **kwargs)
-            self._response_buffer.write(CMD_OK.decode())
-        else:
-            log.debug("%s gets %s.%s", self._client_class_name, self._pool.__class__.__name__, prop.fget.__name__)
-            self._response_buffer.write(str(await return_or_exception(prop.fget, self._pool)))
-
-    async def client_handshake(self) -> None:
-        """
-        Must be invoked before starting any other client interaction.
-
-        Client info is retrieved, server info is sent back, and the
-        :class:`ControlParser <asyncio_taskpool.control.parser.ControlParser>` is set up.
-        """
-        msg = (await self._reader.readline()).decode().strip()
-        client_info = json.loads(msg)
-        log.debug("%s connected", self._client_class_name)
-        parser_kwargs = {
-            'stream': self._response_buffer,
-            CLIENT_INFO.TERMINAL_WIDTH: client_info[CLIENT_INFO.TERMINAL_WIDTH],
-            'prog': '',
-            'usage': f'[-h] [{CMD}] ...'
-        }
-        self._parser = ControlParser(**parser_kwargs)
-        self._parser.add_subparsers(title="Commands",
-                                    metavar="(A command followed by '-h' or '--help' will show command-specific help.)")
-        self._parser.add_class_commands(self._pool.__class__)
-        self._writer.write(str(self._pool).encode() + b'\n')
-        await self._writer.drain()
-
-    async def _parse_command(self, msg: str) -> None:
-        """
-        Takes a message from the client and attempts to parse it.
-
-        If a parsing error occurs, it is returned to the client. If the :exc:`HelpRequested` exception was raised by the
-        :class:`ControlParser`, nothing else happens. Otherwise, the appropriate `_exec...` method is called with the
-        entire dictionary of keyword-arguments returned by the :class:`ControlParser` passed into it.
-
-        Args:
-            msg: The non-empty string read from the client stream.
-        """
-        try:
-            kwargs = vars(self._parser.parse_args(msg.split(' ')))
-        except ArgumentError as e:
-            log.debug("%s got an ArgumentError", self._client_class_name)
-            self._response_buffer.write(str(e))
-            return
-        except (HelpRequested, ParserError):
-            log.debug("%s received usage help", self._client_class_name)
-            return
-        command = kwargs.pop(CMD)
-        if isfunction(command):
-            await self._exec_method_and_respond(command, **kwargs)
-        elif isinstance(command, property):
-            await self._exec_property_and_respond(command, **kwargs)
-        else:
-            self._response_buffer.write(str(CommandError(f"Unknown command object: {command}")))
-
-    async def listen(self) -> None:
-        """
-        Enters the main control loop listening to client input.
-
-        This method only returns if either the server or the client disconnect.
-        Messages from the client are read, parsed, and turned into pool commands (if possible).
-        This method should be called, when the client connection was established and the handshake was successful.
-        It will obviously block indefinitely.
-        """
-        while self._control_server.is_serving():
-            msg = (await self._reader.readline()).decode().strip()
-            if not msg:
-                log.debug("%s disconnected", self._client_class_name)
-                break
-            await self._parse_command(msg)
-            response = self._response_buffer.getvalue() + "\n"
-            self._response_buffer.seek(0)
-            self._response_buffer.truncate()
-            self._writer.write(response.encode())
-            await self._writer.drain()
--- a/src/asyncio_taskpool/exceptions.py
+++ b/src/asyncio_taskpool/exceptions.py
@ -51,6 +51,10 @@ class InvalidGroupName(PoolException):
    pass


+class PoolStillUnlocked(PoolException):
+    pass
+
+
 class NotCoroutine(PoolException):
    pass

@ -59,13 +63,13 @@ class ServerException(Exception):
    pass


+class UnknownTaskPoolClass(ServerException):
+    pass
+
+
+class NotATaskPool(ServerException):
+    pass
+
+
 class HelpRequested(ServerException):
    pass
-
-
-class ParserError(ServerException):
-    pass
-
-
-class CommandError(ServerException):
-    pass
--- a/src/asyncio_taskpool/internals/group_register.py
+++ b/src/asyncio_taskpool/internals/group_register.py
@ -15,9 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along w
 If not, see <https://www.gnu.org/licenses/>."""

 __doc__ = """
-Definition of :class:`TaskGroupRegister`.
-
-It should not be considered part of the public API.
+This module contains the definition of the `TaskGroupRegister` class.
 """


@ -28,9 +26,9 @@ from typing import Iterator, Set

 class TaskGroupRegister(MutableSet):
    """
-    Combines the interface of a regular `set` with that of the `asyncio.Lock`.
+    This class combines the interface of a regular `set` with that of the `asyncio.Lock`.

-    Serves simultaneously as a container of IDs of tasks that belong to the same group, and as a mechanism for
+    It serves simultaneously as a container of IDs of tasks that belong to the same group, and as a mechanism for
    preventing race conditions within a task group. The lock should be acquired before cancelling the entire group of
    tasks, as well as before starting a task within the group.
    """
--- a/src/asyncio_taskpool/helpers.py
+++ b/src/asyncio_taskpool/helpers.py
@ -0,0 +1,69 @@
+__author__ = "Daniil Fajnberg"
+__copyright__ = "Copyright © 2022 Daniil Fajnberg"
+__license__ = """GNU LGPLv3.0
+
+This file is part of asyncio-taskpool.
+
+asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
+version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
+
+asyncio-taskpool 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
+If not, see <https://www.gnu.org/licenses/>."""
+
+__doc__ = """
+Miscellaneous helper functions.
+"""
+
+
+from asyncio.coroutines import iscoroutinefunction
+from asyncio.queues import Queue
+from inspect import getdoc
+from typing import Any, Optional, Union
+
+from .types import T, AnyCallableT, ArgsT, KwArgsT
+
+
+async def execute_optional(function: AnyCallableT, args: ArgsT = (), kwargs: KwArgsT = None) -> Optional[T]:
+    if not callable(function):
+        return
+    if kwargs is None:
+        kwargs = {}
+    if iscoroutinefunction(function):
+        return await function(*args, **kwargs)
+    return function(*args, **kwargs)
+
+
+def star_function(function: AnyCallableT, arg: Any, arg_stars: int = 0) -> T:
+    if arg_stars == 0:
+        return function(arg)
+    if arg_stars == 1:
+        return function(*arg)
+    if arg_stars == 2:
+        return function(**arg)
+    raise ValueError(f"Invalid argument arg_stars={arg_stars}; must be 0, 1, or 2.")
+
+
+async def join_queue(q: Queue) -> None:
+    await q.join()
+
+
+def tasks_str(num: int) -> str:
+    return "tasks" if num != 1 else "task"
+
+
+def get_first_doc_line(obj: object) -> str:
+    return getdoc(obj).strip().split("\n", 1)[0].strip()
+
+
+async def return_or_exception(_function_to_execute: AnyCallableT, *args, **kwargs) -> Union[T, Exception]:
+    try:
+        if iscoroutinefunction(_function_to_execute):
+            return await _function_to_execute(*args, **kwargs)
+        else:
+            return _function_to_execute(*args, **kwargs)
+    except Exception as e:
+        return e
--- a/src/asyncio_taskpool/internals/init.py
+++ b/src/asyncio_taskpool/internals/init.py
--- a/src/asyncio_taskpool/internals/helpers.py
+++ b/src/asyncio_taskpool/internals/helpers.py
@ -1,157 +0,0 @@
-__author__ = "Daniil Fajnberg"
-__copyright__ = "Copyright © 2022 Daniil Fajnberg"
-__license__ = """GNU LGPLv3.0
-
-This file is part of asyncio-taskpool.
-
-asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-asyncio-taskpool 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 Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
-If not, see <https://www.gnu.org/licenses/>."""
-
-__doc__ = """
-Miscellaneous helper functions. None of these should be considered part of the public API.
-"""
-
-
-import builtins
-from asyncio.coroutines import iscoroutinefunction
-from importlib import import_module
-from inspect import getdoc
-from typing import Any, Callable, Optional, Type, Union
-
-from .constants import PYTHON_BEFORE_39
-from .types import T, AnyCallableT, ArgsT, KwArgsT
-
-
-async def execute_optional(function: AnyCallableT, args: ArgsT = (), kwargs: KwArgsT = None) -> Optional[T]:
-    """
-    Runs `function` with `args` and `kwargs` and returns its output.
-
-    Args:
-        function:
-            Any callable that accepts the provided positional and keyword-arguments.
-            If it is a coroutine function, it will be awaited.
-            If it is not a callable, nothing is returned.
-        *args (optional):
-            Positional arguments to pass to `function`.
-        **kwargs (optional):
-            Keyword-arguments to pass to `function`.
-
-    Returns:
-        Whatever `function` returns (possibly after being awaited) or `None` if `function` is not callable.
-    """
-    if not callable(function):
-        return
-    if kwargs is None:
-        kwargs = {}
-    if iscoroutinefunction(function):
-        return await function(*args, **kwargs)
-    return function(*args, **kwargs)
-
-
-def star_function(function: AnyCallableT, arg: Any, arg_stars: int = 0) -> T:
-    """
-    Calls `function` passing `arg` to it, optionally unpacking it first.
-
-    Args:
-        function:
-            Any callable that accepts the provided argument(s).
-        arg:
-            The single positional argument that `function` expects; in this case `arg_stars` should be 0.
-            Or the iterable of positional arguments that `function` expects; in this case `arg_stars` should be 1.
-            Or the mapping of keyword-arguments that `function` expects; in this case `arg_stars` should be 2.
-        arg_stars (optional):
-            Determines if and how to unpack `arg`.
-            0 means no unpacking, i.e. `arg` is passed into `function` directly as `function(arg)`.
-            1 means unpacking to an arbitrary number of positional arguments, i.e. as `function(*arg)`.
-            2 means unpacking to an arbitrary number of keyword-arguments, i.e. as `function(**arg)`.
-
-    Returns:
-        Whatever `function` returns.
-
-    Raises:
-        `ValueError`: `arg_stars` is something other than 0, 1, or 2.
-    """
-    if arg_stars == 0:
-        return function(arg)
-    if arg_stars == 1:
-        return function(*arg)
-    if arg_stars == 2:
-        return function(**arg)
-    raise ValueError(f"Invalid argument arg_stars={arg_stars}; must be 0, 1, or 2.")
-
-
-def get_first_doc_line(obj: object) -> str:
-    """Takes an object and returns the first (non-empty) line of its docstring."""
-    return getdoc(obj).strip().split("\n", 1)[0].strip()
-
-
-async def return_or_exception(_function_to_execute: AnyCallableT, *args, **kwargs) -> Union[T, Exception]:
-    """
-    Returns the output of a function or the exception thrown during its execution.
-
-    Args:
-        _function_to_execute:
-            Any callable that accepts the provided positional and keyword-arguments.
-        *args (optional):
-            Positional arguments to pass to `_function_to_execute`.
-        **kwargs (optional):
-            Keyword-arguments to pass to `_function_to_execute`.
-
-    Returns:
-        Whatever `_function_to_execute` returns or throws. (An exception is not raised, but returned!)
-    """
-    try:
-        if iscoroutinefunction(_function_to_execute):
-            return await _function_to_execute(*args, **kwargs)
-        else:
-            return _function_to_execute(*args, **kwargs)
-    except Exception as e:
-        return e
-
-
-def resolve_dotted_path(dotted_path: str) -> object:
-    """
-    Resolves a dotted path to a global object and returns that object.
-
-    Algorithm shamelessly stolen from the `logging.config` module from the standard library.
-    """
-    names = dotted_path.split('.')
-    module_name = names.pop(0)
-    found = import_module(module_name)
-    for name in names:
-        try:
-            found = getattr(found, name)
-        except AttributeError:
-            module_name += f'.{name}'
-            import_module(module_name)
-            found = getattr(found, name)
-    return found
-
-
-class ClassMethodWorkaround:
-    """Dirty workaround to make the `@classmethod` decorator work with properties."""
-
-    def __init__(self, method_or_property: Union[Callable, property]) -> None:
-        if isinstance(method_or_property, property):
-            self._getter = method_or_property.fget
-        else:
-            self._getter = method_or_property
-
-    def __get__(self, obj: Union[T, None], cls: Union[Type[T], None]) -> Any:
-        if obj is None:
-            return self._getter(cls)
-        return self._getter(obj)
-
-
-# Starting with Python 3.9, this is thankfully no longer necessary.
-if PYTHON_BEFORE_39:
-    classmethod = ClassMethodWorkaround
-else:
-    classmethod = builtins.classmethod
--- a/src/asyncio_taskpool/pool.py
+++ b/src/asyncio_taskpool/pool.py
--- a/src/asyncio_taskpool/queue_context.py
+++ b/src/asyncio_taskpool/queue_context.py
@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along w
 If not, see <https://www.gnu.org/licenses/>."""

 __doc__ = """
-Definition of an :code:`asyncio.Queue` subclass with some small additions.
+This module contains the definition of an `asyncio.Queue` subclass.
 """


@ -23,20 +23,12 @@ from asyncio.queues import Queue as _Queue
 from typing import Any


-__all__ = ['Queue']
-
-
 class Queue(_Queue):
-    """
-    Adds a little syntactic sugar to the :code:`asyncio.Queue`.
-
-    Allows being used as an async context manager awaiting `get` upon entering the context and calling
-    :meth:`item_processed` upon exiting it.
-    """
+    """This just adds a little syntactic sugar to the `asyncio.Queue`."""

    def item_processed(self) -> None:
        """
-        Does exactly the same as :meth:`asyncio.Queue.task_done`.
+        Does exactly the same as `task_done()`.

        This method exists because `task_done` is an atrocious name for the method. It communicates the wrong thing,
        invites confusion, and immensely reduces readability (in the context of this library). And readability counts.
@ -47,7 +39,7 @@ class Queue(_Queue):
        """
        Implements an asynchronous context manager for the queue.

-        Upon entering :meth:`get` is awaited and subsequently whatever came out of the queue is returned.
+        Upon entering `get()` is awaited and subsequently whatever came out of the queue is returned.
        It allows writing code this way:
        >>> queue = Queue()
        >>> ...
@ -60,7 +52,7 @@ class Queue(_Queue):
        """
        Implements an asynchronous context manager for the queue.

-        Upon exiting :meth:`item_processed` is called. This is why this context manager may not always be what you want,
-        but in some situations it makes the code much cleaner.
+        Upon exiting `item_processed()` is called. This is why this context manager may not always be what you want,
+        but in some situations it makes the codes much cleaner.
        """
        self.item_processed()
--- a/src/asyncio_taskpool/control/server.py
+++ b/src/asyncio_taskpool/control/server.py
@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along w
 If not, see <https://www.gnu.org/licenses/>."""

 __doc__ = """
-Task pool control server class definitions.
+This module contains the task pool control server class definitions.
 """


@ -23,74 +23,35 @@ import logging
 from abc import ABC, abstractmethod
 from asyncio import AbstractServer
 from asyncio.exceptions import CancelledError
-from asyncio.streams import StreamReader, StreamWriter, start_server
+from asyncio.streams import StreamReader, StreamWriter, start_unix_server
 from asyncio.tasks import Task, create_task
 from pathlib import Path
 from typing import Optional, Union

-from .client import ControlClient, TCPControlClient, UnixControlClient
+from .client import ControlClient, UnixControlClient
+from .pool import TaskPool, SimpleTaskPool
 from .session import ControlSession
-from ..pool import AnyTaskPoolT
-from ..internals.helpers import classmethod
-from ..internals.types import ConnectedCallbackT, PathT
-
-
-__all__ = ['ControlServer', 'TCPControlServer', 'UnixControlServer']
+from .types import ConnectedCallbackT


 log = logging.getLogger(__name__)


-class ControlServer(ABC):
+class ControlServer(ABC):  # TODO: Implement interface for normal TaskPool instances, not just SimpleTaskPool
    """
    Abstract base class for a task pool control server.

-    This class acts as a wrapper around an async server instance and initializes a
-    :class:`ControlSession <asyncio_taskpool.control.session.ControlSession>` once a client connects to it.
-    The interface is defined within the session class.
+    This class acts as a wrapper around an async server instance and initializes a `ControlSession` upon a client
+    connecting to it. The entire interface is defined within that session class.
    """
    _client_class = ControlClient

    @classmethod
    @property
    def client_class_name(cls) -> str:
-        """Returns the name of the matching control client class."""
+        """Returns the name of the control client class matching the server class."""
        return cls._client_class.__name__

-    def __init__(self, pool: AnyTaskPoolT, **server_kwargs) -> None:
-        """
-        Merely sets internal attributes, but does not start the server yet.
-        The task pool must be passed here and can not be set/changed afterwards. This means a control server is always
-        tied to one specific task pool.
-
-        Args:
-            pool:
-                An instance of a `BaseTaskPool` subclass to tie the server to.
-            **server_kwargs (optional):
-                Keyword arguments that will be passed into the function that starts the server.
-        """
-        self._pool: AnyTaskPoolT = pool
-        self._server_kwargs = server_kwargs
-        self._server: Optional[AbstractServer] = None
-
-    @property
-    def pool(self) -> AnyTaskPoolT:
-        """The task pool instance controlled by the server."""
-        return self._pool
-
-    def is_serving(self) -> bool:
-        """Wrapper around the `asyncio.Server.is_serving` method."""
-        return self._server.is_serving()
-
-    async def _client_connected_cb(self, reader: StreamReader, writer: StreamWriter) -> None:
-        """
-        The universal client callback that will be passed into the `_get_server_instance` method.
-        Instantiates a control session, performs the client handshake, and enters the session's `listen` loop.
-        """
-        session = ControlSession(self, reader, writer)
-        await session.client_handshake()
-        await session.listen()
-
    @abstractmethod
    async def _get_server_instance(self, client_connected_cb: ConnectedCallbackT, **kwargs) -> AbstractServer:
        """
@ -113,6 +74,40 @@ class ControlServer(ABC):
        """The method to run after the server's `serve_forever` methods ends for whatever reason."""
        raise NotImplementedError

+    def __init__(self, pool: Union[TaskPool, SimpleTaskPool], **server_kwargs) -> None:
+        """
+        Initializes by merely saving the internal attributes, but without starting the server yet.
+        The task pool must be passed here and can not be set/changed afterwards. This means a control server is always
+        tied to one specific task pool.
+
+        Args:
+            pool:
+                An instance of a `BaseTaskPool` subclass to tie the server to.
+            **server_kwargs (optional):
+                Keyword arguments that will be passed into the function that starts the server.
+        """
+        self._pool: Union[TaskPool, SimpleTaskPool] = pool
+        self._server_kwargs = server_kwargs
+        self._server: Optional[AbstractServer] = None
+
+    @property
+    def pool(self) -> Union[TaskPool, SimpleTaskPool]:
+        """Read-only property for accessing the task pool instance controlled by the server."""
+        return self._pool
+
+    def is_serving(self) -> bool:
+        """Wrapper around the `asyncio.Server.is_serving` method."""
+        return self._server.is_serving()
+
+    async def _client_connected_cb(self, reader: StreamReader, writer: StreamWriter) -> None:
+        """
+        The universal client callback that will be passed into the `_get_server_instance` method.
+        Instantiates a control session, performs the client handshake, and enters the session's `listen` loop.
+        """
+        session = ControlSession(self, reader, writer)
+        await session.client_handshake()
+        await session.listen()
+
    async def _serve_forever(self) -> None:
        """
        To be run as an `asyncio.Task` by the following method.
@ -129,50 +124,24 @@ class ControlServer(ABC):

    async def serve_forever(self) -> Task:
        """
-        Starts the server and begins listening to client connections.
-
+        This method actually starts the server and begins listening to client connections on the specified interface.
        It should never block because the serving will be performed in a separate task.
-
-        Returns:
-            The forever serving task. To stop the server, this task should be cancelled.
        """
        log.debug("Starting %s...", self.__class__.__name__)
        self._server = await self._get_server_instance(self._client_connected_cb, **self._server_kwargs)
        return create_task(self._serve_forever())


-class TCPControlServer(ControlServer):
-    """Exposes a TCP socket for control clients to connect to."""
-    _client_class = TCPControlClient
-
-    def __init__(self, pool: AnyTaskPoolT, host: str, port: Union[int, str], **server_kwargs) -> None:
-        """`host` and `port` are expected as non-optional server arguments."""
-        self._host = host
-        self._port = port
-        super().__init__(pool, **server_kwargs)
-
-    async def _get_server_instance(self, client_connected_cb: ConnectedCallbackT, **kwargs) -> AbstractServer:
-        server = await start_server(client_connected_cb, self._host, self._port, **kwargs)
-        log.debug("Opened socket at %s:%s", self._host, self._port)
-        return server
-
-    def _final_callback(self) -> None:
-        log.debug("Closed socket at %s:%s", self._host, self._port)
-
-
 class UnixControlServer(ControlServer):
-    """Exposes a unix socket for control clients to connect to."""
+    """Task pool control server class that exposes a unix socket for control clients to connect to."""
    _client_class = UnixControlClient

-    def __init__(self, pool: AnyTaskPoolT, socket_path: PathT, **server_kwargs) -> None:
-        """`socket_path` is expected as a non-optional server argument."""
-        from asyncio.streams import start_unix_server
-        self._start_unix_server = start_unix_server
-        self._socket_path = Path(socket_path)
+    def __init__(self, pool: SimpleTaskPool, **server_kwargs) -> None:
+        self._socket_path = Path(server_kwargs.pop('path'))
        super().__init__(pool, **server_kwargs)

    async def _get_server_instance(self, client_connected_cb: ConnectedCallbackT, **kwargs) -> AbstractServer:
-        server = await self._start_unix_server(client_connected_cb, self._socket_path, **kwargs)
+        server = await start_unix_server(client_connected_cb, self._socket_path, **kwargs)
        log.debug("Opened socket '%s'", str(self._socket_path))
        return server

--- a/src/asyncio_taskpool/session.py
+++ b/src/asyncio_taskpool/session.py
@ -0,0 +1,304 @@
+__author__ = "Daniil Fajnberg"
+__copyright__ = "Copyright © 2022 Daniil Fajnberg"
+__license__ = """GNU LGPLv3.0
+
+This file is part of asyncio-taskpool.
+
+asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
+version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
+
+asyncio-taskpool 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
+If not, see <https://www.gnu.org/licenses/>."""
+
+__doc__ = """
+This module contains the the definition of the control session class used by the control server.
+"""
+
+
+import logging
+import json
+from argparse import ArgumentError, HelpFormatter
+from asyncio.streams import StreamReader, StreamWriter
+from typing import Callable, Optional, Union, TYPE_CHECKING
+
+from .constants import CMD, SESSION_WRITER, SESSION_MSG_BYTES, CLIENT_INFO
+from .exceptions import HelpRequested, NotATaskPool, UnknownTaskPoolClass
+from .helpers import get_first_doc_line, return_or_exception, tasks_str
+from .pool import BaseTaskPool, TaskPool, SimpleTaskPool
+from .session_parser import CommandParser, NUM
+
+if TYPE_CHECKING:
+    from .server import ControlServer
+
+
+log = logging.getLogger(__name__)
+
+
+class ControlSession:
+    """
+    This class defines the API for controlling a task pool instance from the outside.
+
+    The commands received from a connected client are translated into method calls on the task pool instance.
+    A subclass of the standard `argparse.ArgumentParser` is used to handle the input read from the stream.
+    """
+
+    def __init__(self, server: 'ControlServer', reader: StreamReader, writer: StreamWriter) -> None:
+        """
+        Instantiation should happen once a client connection to the control server has already been established.
+
+        For more convenient/efficient access, some of the server's properties are saved in separate attributes.
+        The argument parser is _not_ instantiated in the constructor. It requires a bit of client information during
+        initialization, which is obtained in the `client_handshake` method; only there is the parser fully configured.
+
+        Args:
+            server:
+                The instance of a `ControlServer` subclass starting the session.
+            reader:
+                The `asyncio.StreamReader` created when a client connected to the server.
+            writer:
+                The `asyncio.StreamWriter` created when a client connected to the server.
+        """
+        self._control_server: 'ControlServer' = server
+        self._pool: Union[TaskPool, SimpleTaskPool] = server.pool
+        self._client_class_name = server.client_class_name
+        self._reader: StreamReader = reader
+        self._writer: StreamWriter = writer
+        self._parser: Optional[CommandParser] = None
+        self._subparsers = None
+
+    def _add_command(self, name: str, prog: str = None, short_help: str = None, long_help: str = None,
+                     **kwargs) -> CommandParser:
+        """
+        Convenience method for adding a subparser (i.e. another command) to the main `CommandParser` instance.
+
+        Will always pass the session's main `CommandParser` instance as the `parent` keyword-argument.
+
+        Args:
+            name:
+                The command name; passed directly into the `add_parser` method.
+            prog (optional):
+                Also passed into the `add_parser` method as the corresponding keyword-argument. By default, is set
+                equal to the `name` argument.
+            short_help (optional):
+                Passed into the `add_parser` method as the `help` keyword-argument, unless it is left empty and the
+                `long_help` argument is present; in that case the `long_help` argument is passed as `help`.
+            long_help (optional):
+                Passed into the `add_parser` method as the `description` keyword-argument, unless it is left empty and
+                the `short_help` argument is present; in that case the `short_help` argument is passed as `description`.
+            **kwargs (optional):
+                Any keyword-arguments to directly pass into the `add_parser` method.
+
+        Returns:
+            An instance of the `CommandParser` class representing the newly added control command.
+        """
+        if prog is None:
+            prog = name
+        kwargs.setdefault('help', short_help or long_help)
+        kwargs.setdefault('description', long_help or short_help)
+        return self._subparsers.add_parser(name, prog=prog, parent=self._parser, **kwargs)
+
+    def _add_base_commands(self) -> None:
+        """
+        Adds the commands that are supported regardless of the specific subclass of `BaseTaskPool` controlled.
+
+        These include commands mapping to the following pool methods:
+            - __str__
+            - pool_size (get/set property)
+            - num_running
+        """
+        self._add_command(CMD.NAME, short_help=get_first_doc_line(self._pool.__class__.__str__))
+        self._add_command(
+            CMD.POOL_SIZE, 
+            short_help="Get/set the maximum number of tasks in the pool.", 
+            formatter_class=HelpFormatter
+        ).add_optional_num_argument(
+            default=None,
+            help=f"If passed a number: {get_first_doc_line(self._pool.__class__.pool_size.fset)} "
+                 f"If omitted: {get_first_doc_line(self._pool.__class__.pool_size.fget)}"
+        )
+        self._add_command(CMD.NUM_RUNNING, short_help=get_first_doc_line(self._pool.__class__.num_running.fget))
+
+    def _add_simple_commands(self) -> None:
+        """
+        Adds the commands that are only supported, if a `SimpleTaskPool` object is controlled.
+
+        These include commands mapping to the following pool methods:
+            - start
+            - stop
+            - stop_all
+            - func_name
+        """
+        self._add_command(
+            CMD.START, short_help=get_first_doc_line(self._pool.__class__.start)
+        ).add_optional_num_argument(
+            help="Number of tasks to start."
+        )
+        self._add_command(
+            CMD.STOP, short_help=get_first_doc_line(self._pool.__class__.stop)
+        ).add_optional_num_argument(
+            help="Number of tasks to stop."
+        )
+        self._add_command(CMD.STOP_ALL, short_help=get_first_doc_line(self._pool.__class__.stop_all))
+        self._add_command(CMD.FUNC_NAME, short_help=get_first_doc_line(self._pool.__class__.func_name.fget))
+
+    def _add_advanced_commands(self) -> None:
+        """
+        Adds the commands that are only supported, if a `TaskPool` object is controlled.
+
+        These include commands mapping to the following pool methods:
+            - ...
+        """
+        raise NotImplementedError
+
+    def _init_parser(self, client_terminal_width: int) -> None:
+        """
+        Initializes and fully configures the `CommandParser` responsible for handling the input.
+
+        Depending on what specific task pool class is controlled by the server, different commands are added.
+
+        Args:
+            client_terminal_width:
+                The number of columns of the client's terminal to be able to nicely format messages from the parser.
+        """
+        parser_kwargs = {
+            'prog': '',
+            SESSION_WRITER: self._writer,
+            CLIENT_INFO.TERMINAL_WIDTH: client_terminal_width,
+        }
+        self._parser = CommandParser(**parser_kwargs)
+        self._subparsers = self._parser.add_subparsers(title="Commands", dest=CMD.CMD)
+        self._add_base_commands()
+        if isinstance(self._pool, TaskPool):
+            self._add_advanced_commands()
+        elif isinstance(self._pool, SimpleTaskPool):
+            self._add_simple_commands()
+        elif isinstance(self._pool, BaseTaskPool):
+            raise UnknownTaskPoolClass(f"No interface defined for {self._pool.__class__.__name__}")
+        else:
+            raise NotATaskPool(f"Not a task pool instance: {self._pool}")
+
+    async def client_handshake(self) -> None:
+        """
+        This method must be invoked before starting any other client interaction.
+
+        Client info is retrieved, server info is sent back, and the `CommandParser` is initialized and configured.
+        """
+        client_info = json.loads((await self._reader.read(SESSION_MSG_BYTES)).decode().strip())
+        log.debug("%s connected", self._client_class_name)
+        self._init_parser(client_info[CLIENT_INFO.TERMINAL_WIDTH])
+        self._writer.write(str(self._pool).encode())
+        await self._writer.drain()
+
+    async def _write_function_output(self, func: Callable, *args, **kwargs) -> None:
+        """
+        Acts as a wrapper around a call to a specific task pool method.
+
+        The method is called and any exception is caught and saved. If there is no output and no exception caught, a
+        generic confirmation message is sent back to the client. Otherwise the output or a string representation of
+        the exception caught is sent back.
+
+        Args:
+            func:
+                Reference to the task pool method.
+            *args (optional):
+                Any positional arguments to call the method with.
+            *+kwargs (optional):
+                Any keyword-arguments to call the method with.
+        """
+        output = await return_or_exception(func, *args, **kwargs)
+        self._writer.write(b"ok" if output is None else str(output).encode())
+
+    async def _cmd_name(self, **_kwargs) -> None:
+        """Maps to the `__str__` method of any task pool class."""
+        log.debug("%s requests task pool name", self._client_class_name)
+        await self._write_function_output(self._pool.__class__.__str__, self._pool)
+
+    async def _cmd_pool_size(self, **kwargs) -> None:
+        """Maps to the `pool_size` property of any task pool class."""
+        num = kwargs.get(NUM)
+        if num is None:
+            log.debug("%s requests pool size", self._client_class_name)
+            await self._write_function_output(self._pool.__class__.pool_size.fget, self._pool)
+        else:
+            log.debug("%s requests setting pool size to %s", self._client_class_name, num)
+            await self._write_function_output(self._pool.__class__.pool_size.fset, self._pool, num)
+
+    async def _cmd_num_running(self, **_kwargs) -> None:
+        """Maps to the `num_running` property of any task pool class."""
+        log.debug("%s requests number of running tasks", self._client_class_name)
+        await self._write_function_output(self._pool.__class__.num_running.fget, self._pool)
+
+    async def _cmd_start(self, **kwargs) -> None:
+        """Maps to the `start` method of the `SimpleTaskPool` class."""
+        num = kwargs[NUM]
+        log.debug("%s requests starting %s %s", self._client_class_name, num, tasks_str(num))
+        await self._write_function_output(self._pool.start, num)
+
+    async def _cmd_stop(self, **kwargs) -> None:
+        """Maps to the `stop` method of the `SimpleTaskPool` class."""
+        num = kwargs[NUM]
+        log.debug("%s requests stopping %s %s", self._client_class_name, num, tasks_str(num))
+        await self._write_function_output(self._pool.stop, num)
+
+    async def _cmd_stop_all(self, **_kwargs) -> None:
+        """Maps to the `stop_all` method of the `SimpleTaskPool` class."""
+        log.debug("%s requests stopping all tasks", self._client_class_name)
+        await self._write_function_output(self._pool.stop_all)
+
+    async def _cmd_func_name(self, **_kwargs) -> None:
+        """Maps to the `func_name` method of the `SimpleTaskPool` class."""
+        log.debug("%s requests pool function name", self._client_class_name)
+        await self._write_function_output(self._pool.__class__.func_name.fget, self._pool)
+
+    async def _execute_command(self, **kwargs) -> None:
+        """
+        Dynamically gets the correct `_cmd_...` method depending on the name of the command passed and executes it.
+
+        Args:
+            **kwargs:
+                Must include the `CMD.CMD` key mapping the the command name. The rest of the keyword-arguments is
+                simply passed into the method determined from the command name.
+        """
+        method = getattr(self, f'_cmd_{kwargs.pop(CMD.CMD).replace("-", "_")}')
+        await method(**kwargs)
+
+    async def _parse_command(self, msg: str) -> None:
+        """
+        Takes a message from the client and attempts to parse it.
+
+        If a parsing error occurs, it is returned to the client. If the `HelpRequested` exception was raised by the
+        `CommandParser`, nothing else happens. Otherwise, the `_execute_command` method is called with the entire
+        dictionary of keyword-arguments returned by the `CommandParser` passed into it.
+
+        Args:
+            msg:
+                The non-empty string read from the client stream.
+        """
+        try:
+            kwargs = vars(self._parser.parse_args(msg.split(' ')))
+        except ArgumentError as e:
+            self._writer.write(str(e).encode())
+            return
+        except HelpRequested:
+            return
+        await self._execute_command(**kwargs)
+
+    async def listen(self) -> None:
+        """
+        Enters the main control loop that only ends if either the server or the client disconnect.
+
+        Messages from the client are read and passed into the `_parse_command` method, which handles the rest.
+        This method should be called, when the client connection was established and the handshake was successful.
+        It will obviously block indefinitely.
+        """
+        while self._control_server.is_serving():
+            msg = (await self._reader.read(SESSION_MSG_BYTES)).decode().strip()
+            if not msg:
+                log.debug("%s disconnected", self._client_class_name)
+                break
+            await self._parse_command(msg)
+            await self._writer.drain()
--- a/src/asyncio_taskpool/session_parser.py
+++ b/src/asyncio_taskpool/session_parser.py
@ -0,0 +1,127 @@
+__author__ = "Daniil Fajnberg"
+__copyright__ = "Copyright © 2022 Daniil Fajnberg"
+__license__ = """GNU LGPLv3.0
+
+This file is part of asyncio-taskpool.
+
+asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
+version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
+
+asyncio-taskpool 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
+If not, see <https://www.gnu.org/licenses/>."""
+
+__doc__ = """
+This module contains the the definition of the `CommandParser` class used in a control server session.
+"""
+
+
+from argparse import Action, ArgumentParser, ArgumentDefaultsHelpFormatter, HelpFormatter
+from asyncio.streams import StreamWriter
+from typing import Type, TypeVar
+
+from .constants import SESSION_WRITER, CLIENT_INFO
+from .exceptions import HelpRequested
+
+
+FmtCls = TypeVar('FmtCls', bound=Type[HelpFormatter])
+FORMATTER_CLASS = 'formatter_class'
+NUM = 'num'
+
+
+class CommandParser(ArgumentParser):
+    """
+    Subclass of the standard `argparse.ArgumentParser` for remote interaction.
+
+    Such a parser is not supposed to ever print to stdout/stderr, but instead direct all messages to a `StreamWriter`
+    instance passed to it during initialization.
+    Furthermore, it requires defining the width of the terminal, to adjust help formatting to the terminal size of a
+    connected client.
+    Finally, it offers some convenience methods and makes use of custom exceptions.
+    """
+
+    @staticmethod
+    def help_formatter_factory(terminal_width: int, base_cls: FmtCls = None) -> FmtCls:
+        """
+        Constructs and returns a subclass of `argparse.HelpFormatter` with a fixed terminal width argument.
+
+        Although a custom formatter class can be explicitly passed into the `ArgumentParser` constructor, this is not
+        as convenient, when making use of sub-parsers.
+
+        Args:
+            terminal_width:
+                The number of columns of the terminal to which to adjust help formatting.
+            base_cls (optional):
+                The base class to use for inheritance. By default `argparse.ArgumentDefaultsHelpFormatter` is used.
+
+        Returns:
+            The subclass of `base_cls` which fixes the constructor's `width` keyword-argument to `terminal_width`.
+        """
+        if base_cls is None:
+            base_cls = ArgumentDefaultsHelpFormatter
+
+        class ClientHelpFormatter(base_cls):
+            def __init__(self, *args, **kwargs) -> None:
+                kwargs['width'] = terminal_width
+                super().__init__(*args, **kwargs)
+        return ClientHelpFormatter
+
+    def __init__(self, parent: 'CommandParser' = None, **kwargs) -> None:
+        """
+        Sets additional internal attributes depending on whether a parent-parser was defined.
+
+        The `help_formatter_factory` is called and the returned class is mapped to the `FORMATTER_CLASS` keyword.
+        By default, `exit_on_error` is set to `False` (as opposed to how the parent class handles it).
+
+        Args:
+            parent (optional):
+                An instance of the same class. Intended to be passed as a keyword-argument into the `add_parser` method
+                of the subparsers action returned by the `ArgumentParser.add_subparsers` method. If this is present,
+                the `SESSION_WRITER` and `CLIENT_INFO.TERMINAL_WIDTH` keywords must not be present in `kwargs`.
+            **kwargs(optional):
+                In addition to the regular `ArgumentParser` constructor parameters, this method expects the instance of
+                the `StreamWriter` as well as the terminal width both to be passed explicitly, if the `parent` argument
+                is empty.
+        """
+        self._session_writer: StreamWriter = parent.session_writer if parent else kwargs.pop(SESSION_WRITER)
+        self._terminal_width: int = parent.terminal_width if parent else kwargs.pop(CLIENT_INFO.TERMINAL_WIDTH)
+        kwargs[FORMATTER_CLASS] = self.help_formatter_factory(self._terminal_width, kwargs.get(FORMATTER_CLASS))
+        kwargs.setdefault('exit_on_error', False)
+        super().__init__(**kwargs)
+
+    @property
+    def session_writer(self) -> StreamWriter:
+        """Returns the predefined stream writer object of the control session."""
+        return self._session_writer
+
+    @property
+    def terminal_width(self) -> int:
+        """Returns the predefined terminal width."""
+        return self._terminal_width
+
+    def _print_message(self, message: str, *args, **kwargs) -> None:
+        """This is overridden to ensure that no messages are sent to stdout/stderr, but always to the stream writer."""
+        if message:
+            self._session_writer.write(message.encode())
+
+    def exit(self, status: int = 0, message: str = None) -> None:
+        """This is overridden to prevent system exit to be invoked."""
+        if message:
+            self._print_message(message)
+
+    def print_help(self, file=None) -> None:
+        """This just adds the custom `HelpRequested` exception after the parent class' method."""
+        super().print_help(file)
+        raise HelpRequested
+
+    def add_optional_num_argument(self, *name_or_flags: str, **kwargs) -> Action:
+        """Convenience method for `add_argument` setting the name, `nargs`, `default`, and `type`, unless specified."""
+        if not name_or_flags:
+            name_or_flags = (NUM, )
+        kwargs.setdefault('nargs', '?')
+        kwargs.setdefault('default', 1)
+        kwargs.setdefault('type', int)
+        return self.add_argument(*name_or_flags, **kwargs)
--- a/src/asyncio_taskpool/internals/types.py
+++ b/src/asyncio_taskpool/internals/types.py
@ -16,14 +16,12 @@ If not, see <https://www.gnu.org/licenses/>."""

 __doc__ = """
 Custom type definitions used in various modules.
-
-This module should **not** be considered part of the public API.
 """


 from asyncio.streams import StreamReader, StreamWriter
 from pathlib import Path
-from typing import Any, Awaitable, Callable, Coroutine, Iterable, Mapping, Tuple, TypeVar, Union
+from typing import Any, Awaitable, Callable, Iterable, Mapping, Tuple, TypeVar, Union


 T = TypeVar('T')
@ -31,8 +29,8 @@ T = TypeVar('T')
 ArgsT = Iterable[Any]
 KwArgsT = Mapping[str, Any]

-AnyCallableT = Callable[..., Union[T, Awaitable[T]]]
-CoroutineFunc = Callable[..., Coroutine]
+AnyCallableT = Callable[[...], Union[T, Awaitable[T]]]
+CoroutineFunc = Callable[[...], Awaitable[Any]]

 EndCB = Callable
 CancelCB = Callable
--- a/tests/main.py
+++ b/tests/main.py
@ -1,30 +0,0 @@
-__author__ = "Daniil Fajnberg"
-__copyright__ = "Copyright © 2022 Daniil Fajnberg"
-__license__ = """GNU LGPLv3.0
-
-This file is part of asyncio-taskpool.
-
-asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-asyncio-taskpool 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 Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
-If not, see <https://www.gnu.org/licenses/>."""
-
-__doc__ = """
-Main entry point for all unit tests.
-"""
-
-
-import sys
-import unittest
-
-
-if __name__ == '__main__':
-    test_suite = unittest.defaultTestLoader.discover('.')
-    test_runner = unittest.TextTestRunner(resultclass=unittest.TextTestResult)
-    result = test_runner.run(test_suite)
-    sys.exit(not result.wasSuccessful())
--- a/tests/test_control/test_client.py
+++ b/tests/test_control/test_client.py
@ -20,15 +20,14 @@ Unittests for the `asyncio_taskpool.client` module.


 import json
-import os
 import shutil
 import sys
 from pathlib import Path
-from unittest import IsolatedAsyncioTestCase, skipIf
-from unittest.mock import AsyncMock, MagicMock, call, patch
+from unittest import IsolatedAsyncioTestCase
+from unittest.mock import AsyncMock, MagicMock, patch

-from asyncio_taskpool.control import client
-from asyncio_taskpool.internals.constants import CLIENT_INFO, SESSION_MSG_BYTES
+from asyncio_taskpool import client
+from asyncio_taskpool.constants import CLIENT_INFO, SESSION_MSG_BYTES


 FOO, BAR = 'foo', 'bar'
@ -37,7 +36,7 @@ FOO, BAR = 'foo', 'bar'
 class ControlClientTestCase(IsolatedAsyncioTestCase):

    def setUp(self) -> None:
-        self.abstract_patcher = patch('asyncio_taskpool.control.client.ControlClient.__abstractmethods__', set())
+        self.abstract_patcher = patch('asyncio_taskpool.client.ControlClient.__abstractmethods__', set())
        self.print_patcher = patch.object(client, 'print')
        self.mock_abstract_methods = self.abstract_patcher.start()
        self.mock_print = self.print_patcher.start()
@ -55,7 +54,7 @@ class ControlClientTestCase(IsolatedAsyncioTestCase):

    def test_client_info(self):
        self.assertEqual({CLIENT_INFO.TERMINAL_WIDTH: shutil.get_terminal_size().columns},
-                         client.ControlClient._client_info())
+                         client.ControlClient.client_info())

    async def test_abstract(self):
        with self.assertRaises(NotImplementedError):
@ -65,19 +64,16 @@ class ControlClientTestCase(IsolatedAsyncioTestCase):
        self.assertEqual(self.kwargs, self.client._conn_kwargs)
        self.assertFalse(self.client._connected)

-    @patch.object(client.ControlClient, '_client_info')
-    async def test__server_handshake(self, mock__client_info: MagicMock):
-        mock__client_info.return_value = mock_info = {FOO: 1, BAR: 9999}
+    @patch.object(client.ControlClient, 'client_info')
+    async def test__server_handshake(self, mock_client_info: MagicMock):
+        mock_client_info.return_value = mock_info = {FOO: 1, BAR: 9999}
        self.assertIsNone(await self.client._server_handshake(self.mock_reader, self.mock_writer))
        self.assertTrue(self.client._connected)
-        mock__client_info.assert_called_once_with()
-        self.mock_write.assert_has_calls([call(json.dumps(mock_info).encode()), call(b'\n')])
+        mock_client_info.assert_called_once_with()
+        self.mock_write.assert_called_once_with(json.dumps(mock_info).encode())
        self.mock_drain.assert_awaited_once_with()
        self.mock_read.assert_awaited_once_with(SESSION_MSG_BYTES)
-        self.mock_print.assert_has_calls([
-            call("Connected to", self.mock_read.return_value.decode()),
-            call("Type '-h' to get help and usage instructions for all available commands.\n")
-        ])
+        self.mock_print.assert_called_once_with("Connected to", self.mock_read.return_value.decode())

    @patch.object(client, 'input')
    def test__get_command(self, mock_input: MagicMock):
@ -121,7 +117,7 @@ class ControlClientTestCase(IsolatedAsyncioTestCase):
        mock__get_command.return_value = cmd = FOO + BAR + ' 123'
        self.mock_drain.side_effect = err = ConnectionError()
        self.assertIsNone(await self.client._interact(self.mock_reader, self.mock_writer))
-        self.mock_write.assert_has_calls([call(cmd.encode()), call(b'\n')])
+        self.mock_write.assert_called_once_with(cmd.encode())
        self.mock_drain.assert_awaited_once_with()
        self.mock_read.assert_not_awaited()
        self.mock_print.assert_called_once_with(err, file=sys.stderr)
@ -133,7 +129,7 @@ class ControlClientTestCase(IsolatedAsyncioTestCase):
        self.mock_print.reset_mock()

        self.assertIsNone(await self.client._interact(self.mock_reader, self.mock_writer))
-        self.mock_write.assert_has_calls([call(cmd.encode()), call(b'\n')])
+        self.mock_write.assert_called_once_with(cmd.encode())
        self.mock_drain.assert_awaited_once_with()
        self.mock_read.assert_awaited_once_with(SESSION_MSG_BYTES)
        self.mock_print.assert_called_once_with(FOO)
@ -175,44 +171,6 @@ class ControlClientTestCase(IsolatedAsyncioTestCase):
        self.mock_print.assert_called_once_with("Disconnected from control server.")


-class TCPControlClientTestCase(IsolatedAsyncioTestCase):
-
-    def setUp(self) -> None:
-        self.base_init_patcher = patch.object(client.ControlClient, '__init__')
-        self.mock_base_init = self.base_init_patcher.start()
-        self.host, self.port = 'localhost', 12345
-        self.kwargs = {FOO: 123, BAR: 456}
-        self.client = client.TCPControlClient(host=self.host, port=self.port, **self.kwargs)
-
-    def tearDown(self) -> None:
-        self.base_init_patcher.stop()
-
-    def test_init(self):
-        self.assertEqual(self.host, self.client._host)
-        self.assertEqual(self.port, self.client._port)
-        self.mock_base_init.assert_called_once_with(**self.kwargs)
-
-    @patch.object(client, 'print')
-    @patch.object(client, 'open_connection')
-    async def test__open_connection(self, mock_open_connection: AsyncMock, mock_print: MagicMock):
-        mock_open_connection.return_value = expected_output = 'something'
-        kwargs = {'a': 1, 'b': 2}
-        output = await self.client._open_connection(**kwargs)
-        self.assertEqual(expected_output, output)
-        mock_open_connection.assert_awaited_once_with(self.host, self.port, **kwargs)
-        mock_print.assert_not_called()
-
-        mock_open_connection.reset_mock()
-
-        mock_open_connection.side_effect = e = ConnectionError()
-        output1, output2 = await self.client._open_connection(**kwargs)
-        self.assertIsNone(output1)
-        self.assertIsNone(output2)
-        mock_open_connection.assert_awaited_once_with(self.host, self.port, **kwargs)
-        mock_print.assert_called_once_with(str(e), file=sys.stderr)
-
-
-@skipIf(os.name == 'nt', "No Unix sockets on Windows :(")
 class UnixControlClientTestCase(IsolatedAsyncioTestCase):

    def setUp(self) -> None:
@ -230,9 +188,9 @@ class UnixControlClientTestCase(IsolatedAsyncioTestCase):
        self.mock_base_init.assert_called_once_with(**self.kwargs)

    @patch.object(client, 'print')
-    async def test__open_connection(self, mock_print: MagicMock):
-        expected_output = 'something'
-        self.client._open_unix_connection = mock_open_unix_connection = AsyncMock(return_value=expected_output)
+    @patch.object(client, 'open_unix_connection')
+    async def test__open_connection(self, mock_open_unix_connection: AsyncMock, mock_print: MagicMock):
+        mock_open_unix_connection.return_value = expected_output = 'something'
        kwargs = {'a': 1, 'b': 2}
        output = await self.client._open_connection(**kwargs)
        self.assertEqual(expected_output, output)
--- a/tests/test_control/init.py
+++ b/tests/test_control/init.py
--- a/tests/test_control/test_main.py
+++ b/tests/test_control/test_main.py
@ -1,45 +0,0 @@
-from pathlib import Path
-from unittest import IsolatedAsyncioTestCase
-from unittest.mock import AsyncMock, MagicMock, patch
-
-from asyncio_taskpool.control.client import TCPControlClient, UnixControlClient
-from asyncio_taskpool.control import __main__ as module
-
-
-class CLITestCase(IsolatedAsyncioTestCase):
-
-    def test_parse_cli(self):
-        socket_path = '/some/path/to.sock'
-        args = [module.UNIX, socket_path]
-        expected_kwargs = {
-            module.CLIENT_CLASS: UnixControlClient,
-            module.SOCKET_PATH: Path(socket_path)
-        }
-        parsed_kwargs = module.parse_cli(args)
-        self.assertDictEqual(expected_kwargs, parsed_kwargs)
-
-        host, port = '1.2.3.4', '1234'
-        args = [module.TCP, host, port]
-        expected_kwargs = {
-            module.CLIENT_CLASS: TCPControlClient,
-            module.HOST: host,
-            module.PORT: int(port)
-        }
-        parsed_kwargs = module.parse_cli(args)
-        self.assertDictEqual(expected_kwargs, parsed_kwargs)
-
-        with patch('sys.stderr'):
-            with self.assertRaises(SystemExit):
-                module.parse_cli(['invalid', 'foo', 'bar'])
-
-    @patch.object(module, 'parse_cli')
-    async def test_main(self, mock_parse_cli: MagicMock):
-        mock_client_start = AsyncMock()
-        mock_client = MagicMock(start=mock_client_start)
-        mock_client_cls = MagicMock(return_value=mock_client)
-        mock_client_kwargs = {'foo': 123, 'bar': 456, 'baz': 789}
-        mock_parse_cli.return_value = {module.CLIENT_CLASS: mock_client_cls, **mock_client_kwargs}
-        self.assertIsNone(await module.main())
-        mock_parse_cli.assert_called_once_with()
-        mock_client_cls.assert_called_once_with(**mock_client_kwargs)
-        mock_client_start.assert_awaited_once_with()
--- a/tests/test_control/test_parser.py
+++ b/tests/test_control/test_parser.py
@ -1,311 +0,0 @@
-__author__ = "Daniil Fajnberg"
-__copyright__ = "Copyright © 2022 Daniil Fajnberg"
-__license__ = """GNU LGPLv3.0
-
-This file is part of asyncio-taskpool.
-
-asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-asyncio-taskpool 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 Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
-If not, see <https://www.gnu.org/licenses/>."""
-
-__doc__ = """
-Unittests for the `asyncio_taskpool.control.parser` module.
-"""
-
-
-from argparse import ArgumentParser, HelpFormatter, ArgumentDefaultsHelpFormatter, RawTextHelpFormatter, SUPPRESS
-from ast import literal_eval
-from inspect import signature
-from unittest import TestCase
-from unittest.mock import MagicMock, call, patch
-from typing import Iterable
-
-from asyncio_taskpool.control import parser
-from asyncio_taskpool.exceptions import HelpRequested, ParserError
-from asyncio_taskpool.internals.helpers import resolve_dotted_path
-from asyncio_taskpool.internals.types import ArgsT, CancelCB, CoroutineFunc, EndCB, KwArgsT
-
-
-FOO, BAR = 'foo', 'bar'
-
-
-class ControlParserTestCase(TestCase):
-
-    def setUp(self) -> None:
-        self.help_formatter_factory_patcher = patch.object(parser.ControlParser, 'help_formatter_factory')
-        self.mock_help_formatter_factory = self.help_formatter_factory_patcher.start()
-        self.mock_help_formatter_factory.return_value = RawTextHelpFormatter
-        self.stream, self.terminal_width = MagicMock(), 420
-        self.kwargs = {
-            'stream': self.stream,
-            'terminal_width': self.terminal_width,
-            'formatter_class': FOO
-        }
-        self.parser = parser.ControlParser(**self.kwargs)
-
-    def tearDown(self) -> None:
-        self.help_formatter_factory_patcher.stop()
-
-    def test_help_formatter_factory(self):
-        self.help_formatter_factory_patcher.stop()
-
-        class MockBaseClass(HelpFormatter):
-            def __init__(self, *args, **kwargs):
-                super().__init__(*args, **kwargs)
-
-        terminal_width = 123456789
-        cls = parser.ControlParser.help_formatter_factory(terminal_width, MockBaseClass)
-        self.assertTrue(issubclass(cls, MockBaseClass))
-        instance = cls('prog')
-        self.assertEqual(terminal_width, getattr(instance, '_width'))
-
-        cls = parser.ControlParser.help_formatter_factory(terminal_width)
-        self.assertTrue(issubclass(cls, ArgumentDefaultsHelpFormatter))
-        instance = cls('prog')
-        self.assertEqual(terminal_width, getattr(instance, '_width'))
-
-    def test_init(self):
-        self.assertIsInstance(self.parser, ArgumentParser)
-        self.assertEqual(self.stream, self.parser._stream)
-        self.assertEqual(self.terminal_width, self.parser._terminal_width)
-        self.mock_help_formatter_factory.assert_called_once_with(self.terminal_width, FOO)
-        self.assertEqual(RawTextHelpFormatter, getattr(self.parser, 'formatter_class'))
-        self.assertSetEqual(set(), self.parser._flags)
-        self.assertIsNone(self.parser._commands)
-
-    @patch.object(parser, 'get_first_doc_line')
-    def test_add_function_command(self, mock_get_first_doc_line: MagicMock):
-        def foo_bar(): pass
-        mock_subparser = MagicMock()
-        mock_add_parser = MagicMock(return_value=mock_subparser)
-        self.parser._commands = MagicMock(add_parser=mock_add_parser)
-        mock_get_first_doc_line.return_value = mock_help = 'help 123'
-        kwargs = {FOO: 1, BAR: 2, parser.DESCRIPTION: FOO + BAR}
-        expected_name = 'foo-bar'
-        expected_kwargs = {parser.NAME: expected_name, parser.PROG: expected_name, parser.HELP: mock_help, **kwargs}
-        to_omit = ['abc', 'xyz']
-        output = self.parser.add_function_command(foo_bar, omit_params=to_omit, **kwargs)
-        self.assertEqual(mock_subparser, output)
-        mock_add_parser.assert_called_once_with(**expected_kwargs)
-        mock_subparser.add_function_args.assert_called_once_with(foo_bar, to_omit)
-
-    @patch.object(parser, 'get_first_doc_line')
-    def test_add_property_command(self, mock_get_first_doc_line: MagicMock):
-        def get_prop(_self): pass
-        def set_prop(_self, _value): pass
-        prop = property(get_prop)
-        mock_subparser = MagicMock()
-        mock_add_parser = MagicMock(return_value=mock_subparser)
-        self.parser._commands = MagicMock(add_parser=mock_add_parser)
-        mock_get_first_doc_line.return_value = mock_help = 'help 123'
-        kwargs = {FOO: 1, BAR: 2, parser.DESCRIPTION: FOO + BAR}
-        expected_name = 'get-prop'
-        expected_kwargs = {parser.NAME: expected_name, parser.PROG: expected_name, parser.HELP: mock_help, **kwargs}
-        output = self.parser.add_property_command(prop, **kwargs)
-        self.assertEqual(mock_subparser, output)
-        mock_get_first_doc_line.assert_called_once_with(get_prop)
-        mock_add_parser.assert_called_once_with(**expected_kwargs)
-        mock_subparser.add_function_arg.assert_not_called()
-
-        mock_get_first_doc_line.reset_mock()
-        mock_add_parser.reset_mock()
-
-        prop = property(get_prop, set_prop)
-        expected_help = f"Get/set the `.{expected_name}` property"
-        expected_kwargs = {parser.NAME: expected_name, parser.PROG: expected_name, parser.HELP: expected_help, **kwargs}
-        output = self.parser.add_property_command(prop, **kwargs)
-        self.assertEqual(mock_subparser, output)
-        mock_get_first_doc_line.assert_has_calls([call(get_prop), call(set_prop)])
-        mock_add_parser.assert_called_once_with(**expected_kwargs)
-        mock_subparser.add_function_arg.assert_called_once_with(
-            tuple(signature(set_prop).parameters.values())[1],
-            nargs='?',
-            default=SUPPRESS,
-            help=f"If provided: {mock_help} If omitted: {mock_help}"
-        )
-
-    @patch.object(parser.ControlParser, 'add_property_command')
-    @patch.object(parser.ControlParser, 'add_function_command')
-    def test_add_class_commands(self, mock_add_function_command: MagicMock, mock_add_property_command: MagicMock):
-        class FooBar:
-            some_attribute = None
-
-            def _protected(self, _): pass
-
-            def __private(self, _): pass
-
-            def to_omit(self, _): pass
-
-            def method(self, _): pass
-
-            @property
-            def prop(self): return None
-
-        mock_set_defaults = MagicMock()
-        mock_subparser = MagicMock(set_defaults=mock_set_defaults)
-        mock_add_function_command.return_value = mock_add_property_command.return_value = mock_subparser
-        x = 'x'
-        common_kwargs = {'stream': self.parser._stream, parser.CLIENT_INFO.TERMINAL_WIDTH: self.parser._terminal_width}
-        expected_output = {'method': mock_subparser, 'prop': mock_subparser}
-        output = self.parser.add_class_commands(FooBar, public_only=True, omit_members=['to_omit'], member_arg_name=x)
-        self.assertDictEqual(expected_output, output)
-        mock_add_function_command.assert_called_once_with(FooBar.method, **common_kwargs)
-        mock_add_property_command.assert_called_once_with(FooBar.prop, FooBar.__name__, **common_kwargs)
-        mock_set_defaults.assert_has_calls([call(**{x: FooBar.method}), call(**{x: FooBar.prop})])
-
-    @patch.object(parser.ArgumentParser, 'add_subparsers')
-    def test_add_subparsers(self, mock_base_add_subparsers: MagicMock):
-        args, kwargs = [1, 2, 42], {FOO: 123, BAR: 456}
-        mock_base_add_subparsers.return_value = mock_action = MagicMock()
-        output = self.parser.add_subparsers(*args, **kwargs)
-        self.assertEqual(mock_action, output)
-        mock_base_add_subparsers.assert_called_once_with(*args, **kwargs)
-
-    def test__print_message(self):
-        self.stream.write = MagicMock()
-        self.assertIsNone(self.parser._print_message(''))
-        self.stream.write.assert_not_called()
-        msg = 'foo bar baz'
-        self.assertIsNone(self.parser._print_message(msg))
-        self.stream.write.assert_called_once_with(msg)
-
-    @patch.object(parser.ControlParser, '_print_message')
-    def test_exit(self, mock__print_message: MagicMock):
-        self.assertIsNone(self.parser.exit(123, ''))
-        mock__print_message.assert_not_called()
-        msg = 'foo bar baz'
-        self.assertIsNone(self.parser.exit(123, msg))
-        mock__print_message.assert_called_once_with(msg)
-
-    @patch.object(parser.ArgumentParser, 'error')
-    def test_error(self, mock_supercls_error: MagicMock):
-        with self.assertRaises(ParserError):
-            self.parser.error(FOO + BAR)
-        mock_supercls_error.assert_called_once_with(message=FOO + BAR)
-
-    @patch.object(parser.ArgumentParser, 'print_help')
-    def test_print_help(self, mock_print_help: MagicMock):
-        arg = MagicMock()
-        with self.assertRaises(HelpRequested):
-            self.parser.print_help(arg)
-        mock_print_help.assert_called_once_with(arg)
-
-    @patch.object(parser, '_get_type_from_annotation')
-    @patch.object(parser.ArgumentParser, 'add_argument')
-    def test_add_function_arg(self, mock_add_argument: MagicMock, mock__get_type_from_annotation: MagicMock):
-        mock_add_argument.return_value = expected_output = 'action'
-        mock__get_type_from_annotation.return_value = mock_type = 'fake'
-
-        foo_type, args_type, bar_type, baz_type, boo_type = tuple, str, int, float, complex
-        bar_default, baz_default, boo_default = 1, 0.1, 1j
-
-        def func(foo: foo_type, *args: args_type, bar: bar_type = bar_default, baz: baz_type = baz_default,
-                 boo: boo_type = boo_default, flag: bool = False):
-            return foo, args, bar, baz, boo, flag
-
-        param_foo, param_args, param_bar, param_baz, param_boo, param_flag = signature(func).parameters.values()
-        kwargs = {FOO + BAR: 'xyz'}
-        self.assertEqual(expected_output, self.parser.add_function_arg(param_foo, **kwargs))
-        mock_add_argument.assert_called_once_with('foo', type=mock_type, **kwargs)
-        mock__get_type_from_annotation.assert_called_once_with(foo_type)
-
-        mock_add_argument.reset_mock()
-        mock__get_type_from_annotation.reset_mock()
-
-        self.assertEqual(expected_output, self.parser.add_function_arg(param_args, **kwargs))
-        mock_add_argument.assert_called_once_with('args', nargs='*', type=mock_type, **kwargs)
-        mock__get_type_from_annotation.assert_called_once_with(args_type)
-
-        mock_add_argument.reset_mock()
-        mock__get_type_from_annotation.reset_mock()
-
-        self.assertEqual(expected_output, self.parser.add_function_arg(param_bar, **kwargs))
-        mock_add_argument.assert_called_once_with('-b', '--bar', default=bar_default, type=mock_type, **kwargs)
-        mock__get_type_from_annotation.assert_called_once_with(bar_type)
-
-        mock_add_argument.reset_mock()
-        mock__get_type_from_annotation.reset_mock()
-
-        self.assertEqual(expected_output, self.parser.add_function_arg(param_baz, **kwargs))
-        mock_add_argument.assert_called_once_with('-B', '--baz', default=baz_default, type=mock_type, **kwargs)
-        mock__get_type_from_annotation.assert_called_once_with(baz_type)
-
-        mock_add_argument.reset_mock()
-        mock__get_type_from_annotation.reset_mock()
-
-        self.assertEqual(expected_output, self.parser.add_function_arg(param_boo, **kwargs))
-        mock_add_argument.assert_called_once_with('--boo', default=boo_default, type=mock_type, **kwargs)
-        mock__get_type_from_annotation.assert_called_once_with(boo_type)
-
-        mock_add_argument.reset_mock()
-        mock__get_type_from_annotation.reset_mock()
-
-        self.assertEqual(expected_output, self.parser.add_function_arg(param_flag, **kwargs))
-        mock_add_argument.assert_called_once_with('-f', '--flag', action='store_true', **kwargs)
-        mock__get_type_from_annotation.assert_not_called()
-
-    @patch.object(parser.ControlParser, 'add_function_arg')
-    def test_add_function_args(self, mock_add_function_arg: MagicMock):
-        def func(foo: str, *args: int, bar: float = 0.1):
-            return foo, args, bar
-        _, param_args, param_bar = signature(func).parameters.values()
-        self.assertIsNone(self.parser.add_function_args(func, omit=['foo']))
-        mock_add_function_arg.assert_has_calls([
-            call(param_args, help=repr(param_args.annotation)),
-            call(param_bar, help=repr(param_bar.annotation)),
-        ])
-
-
-class RestTestCase(TestCase):
-    log_lvl: int
-
-    @classmethod
-    def setUpClass(cls) -> None:
-        cls.log_lvl = parser.log.level
-        parser.log.setLevel(999)
-
-    @classmethod
-    def tearDownClass(cls) -> None:
-        parser.log.setLevel(cls.log_lvl)
-
-    def test__get_arg_type_wrapper(self):
-        type_wrap = parser._get_arg_type_wrapper(int)
-        self.assertEqual('int', type_wrap.__name__)
-        self.assertEqual(SUPPRESS, type_wrap(SUPPRESS))
-        self.assertEqual(13, type_wrap('13'))
-
-        name = 'abcdef'
-        mock_type = MagicMock(side_effect=[parser.ArgumentTypeError, TypeError, ValueError, Exception], __name__=name)
-        type_wrap = parser._get_arg_type_wrapper(mock_type)
-        self.assertEqual(name, type_wrap.__name__)
-        with self.assertRaises(parser.ArgumentTypeError):
-            type_wrap(FOO)
-        with self.assertRaises(TypeError):
-            type_wrap(FOO)
-        with self.assertRaises(ValueError):
-            type_wrap(FOO)
-        with self.assertRaises(parser.ArgumentTypeError):
-            type_wrap(FOO)
-
-    @patch.object(parser, '_get_arg_type_wrapper')
-    def test__get_type_from_annotation(self, mock__get_arg_type_wrapper: MagicMock):
-        mock__get_arg_type_wrapper.return_value = expected_output = FOO + BAR
-        dotted_path_ann = [CoroutineFunc, EndCB, CancelCB]
-        literal_eval_ann = [ArgsT, KwArgsT, Iterable[ArgsT], Iterable[KwArgsT]]
-        any_other_ann = MagicMock()
-        for a in dotted_path_ann:
-            self.assertEqual(expected_output, parser._get_type_from_annotation(a))
-        mock__get_arg_type_wrapper.assert_has_calls(len(dotted_path_ann) * [call(resolve_dotted_path)])
-        mock__get_arg_type_wrapper.reset_mock()
-        for a in literal_eval_ann:
-            self.assertEqual(expected_output, parser._get_type_from_annotation(a))
-        mock__get_arg_type_wrapper.assert_has_calls(len(literal_eval_ann) * [call(literal_eval)])
-        mock__get_arg_type_wrapper.reset_mock()
-        self.assertEqual(expected_output, parser._get_type_from_annotation(any_other_ann))
-        mock__get_arg_type_wrapper.assert_called_once_with(any_other_ann)
--- a/tests/test_control/test_session.py
+++ b/tests/test_control/test_session.py
@ -1,217 +0,0 @@
-__author__ = "Daniil Fajnberg"
-__copyright__ = "Copyright © 2022 Daniil Fajnberg"
-__license__ = """GNU LGPLv3.0
-
-This file is part of asyncio-taskpool.
-
-asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-asyncio-taskpool 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 Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
-If not, see <https://www.gnu.org/licenses/>."""
-
-__doc__ = """
-Unittests for the `asyncio_taskpool.session` module.
-"""
-
-
-import json
-from argparse import ArgumentError, Namespace
-from io import StringIO
-from unittest import IsolatedAsyncioTestCase
-from unittest.mock import AsyncMock, MagicMock, patch, call
-
-from asyncio_taskpool.control import session
-from asyncio_taskpool.internals.constants import CLIENT_INFO, CMD
-from asyncio_taskpool.exceptions import HelpRequested
-from asyncio_taskpool.pool import SimpleTaskPool
-
-
-FOO, BAR = 'foo', 'bar'
-
-
-class ControlServerTestCase(IsolatedAsyncioTestCase):
-    log_lvl: int
-
-    @classmethod
-    def setUpClass(cls) -> None:
-        cls.log_lvl = session.log.level
-        session.log.setLevel(999)
-
-    @classmethod
-    def tearDownClass(cls) -> None:
-        session.log.setLevel(cls.log_lvl)
-
-    def setUp(self) -> None:
-        self.mock_pool = MagicMock(spec=SimpleTaskPool(AsyncMock()))
-        self.mock_client_class_name = FOO + BAR
-        self.mock_server = MagicMock(pool=self.mock_pool,
-                                     client_class_name=self.mock_client_class_name)
-        self.mock_reader = MagicMock()
-        self.mock_writer = MagicMock()
-        self.session = session.ControlSession(self.mock_server, self.mock_reader, self.mock_writer)
-
-    def test_init(self):
-        self.assertEqual(self.mock_server, self.session._control_server)
-        self.assertEqual(self.mock_pool, self.session._pool)
-        self.assertEqual(self.mock_client_class_name, self.session._client_class_name)
-        self.assertEqual(self.mock_reader, self.session._reader)
-        self.assertEqual(self.mock_writer, self.session._writer)
-        self.assertIsNone(self.session._parser)
-        self.assertIsInstance(self.session._response_buffer, StringIO)
-
-    @patch.object(session, 'return_or_exception')
-    async def test__exec_method_and_respond(self, mock_return_or_exception: AsyncMock):
-        def method(self, arg1, arg2, *var_args, **rest): pass
-        test_arg1, test_arg2, test_var_args, test_rest = 123, 'xyz', [0.1, 0.2, 0.3], {'aaa': 1, 'bbb': 11}
-        kwargs = {'arg1': test_arg1, 'arg2': test_arg2, 'var_args': test_var_args}
-        mock_return_or_exception.return_value = None
-        self.assertIsNone(await self.session._exec_method_and_respond(method, **kwargs, **test_rest))
-        mock_return_or_exception.assert_awaited_once_with(
-            method, self.mock_pool, test_arg1, test_arg2, *test_var_args, **test_rest
-        )
-        self.assertEqual(session.CMD_OK.decode(), self.session._response_buffer.getvalue())
-
-    @patch.object(session, 'return_or_exception')
-    async def test__exec_property_and_respond(self, mock_return_or_exception: AsyncMock):
-        def prop_get(_): pass
-        def prop_set(_): pass
-        prop = property(prop_get, prop_set)
-        kwargs = {'value': 'something'}
-        mock_return_or_exception.return_value = None
-        self.assertIsNone(await self.session._exec_property_and_respond(prop, **kwargs))
-        mock_return_or_exception.assert_awaited_once_with(prop_set, self.mock_pool, **kwargs)
-        self.assertEqual(session.CMD_OK.decode(), self.session._response_buffer.getvalue())
-
-        mock_return_or_exception.reset_mock()
-        self.session._response_buffer.seek(0)
-        self.session._response_buffer.truncate()
-
-        mock_return_or_exception.return_value = val = 420.69
-        self.assertIsNone(await self.session._exec_property_and_respond(prop))
-        mock_return_or_exception.assert_awaited_once_with(prop_get, self.mock_pool)
-        self.assertEqual(str(val), self.session._response_buffer.getvalue())
-
-    @patch.object(session, 'ControlParser')
-    async def test_client_handshake(self, mock_parser_cls: MagicMock):
-        mock_add_subparsers, mock_add_class_commands = MagicMock(), MagicMock()
-        mock_parser = MagicMock(add_subparsers=mock_add_subparsers, add_class_commands=mock_add_class_commands)
-        mock_parser_cls.return_value = mock_parser
-        width = 5678
-        msg = ' ' + json.dumps({CLIENT_INFO.TERMINAL_WIDTH: width, FOO: BAR}) + '  '
-        mock_readline = AsyncMock(return_value=msg.encode())
-        self.mock_reader.readline = mock_readline
-        self.mock_writer.drain = AsyncMock()
-        expected_parser_kwargs = {
-            'stream': self.session._response_buffer,
-            CLIENT_INFO.TERMINAL_WIDTH: width,
-            'prog': '',
-            'usage': f'[-h] [{CMD}] ...'
-        }
-        expected_subparsers_kwargs = {
-            'title': "Commands",
-            'metavar': "(A command followed by '-h' or '--help' will show command-specific help.)"
-        }
-        self.assertIsNone(await self.session.client_handshake())
-        self.assertEqual(mock_parser, self.session._parser)
-        mock_readline.assert_awaited_once_with()
-        mock_parser_cls.assert_called_once_with(**expected_parser_kwargs)
-        mock_add_subparsers.assert_called_once_with(**expected_subparsers_kwargs)
-        mock_add_class_commands.assert_called_once_with(self.mock_pool.__class__)
-        self.mock_writer.write.assert_called_once_with(str(self.mock_pool).encode() + b'\n')
-        self.mock_writer.drain.assert_awaited_once_with()
-
-    @patch.object(session.ControlSession, '_exec_property_and_respond')
-    @patch.object(session.ControlSession, '_exec_method_and_respond')
-    async def test__parse_command(self, mock__exec_method_and_respond: AsyncMock,
-                                  mock__exec_property_and_respond: AsyncMock):
-        def method(_): pass
-        prop = property(method)
-        msg = 'asdf asd as a'
-        kwargs = {FOO: BAR, 'hello': 'python'}
-        mock_parse_args = MagicMock(return_value=Namespace(**{CMD: method}, **kwargs))
-        self.session._parser = MagicMock(parse_args=mock_parse_args)
-        self.assertIsNone(await self.session._parse_command(msg))
-        mock_parse_args.assert_called_once_with(msg.split(' '))
-        self.assertEqual('', self.session._response_buffer.getvalue())
-        mock__exec_method_and_respond.assert_awaited_once_with(method, **kwargs)
-        mock__exec_property_and_respond.assert_not_called()
-
-        mock__exec_method_and_respond.reset_mock()
-        mock_parse_args.reset_mock()
-
-        mock_parse_args.return_value = Namespace(**{CMD: prop}, **kwargs)
-        self.assertIsNone(await self.session._parse_command(msg))
-        mock_parse_args.assert_called_once_with(msg.split(' '))
-        self.assertEqual('', self.session._response_buffer.getvalue())
-        mock__exec_method_and_respond.assert_not_called()
-        mock__exec_property_and_respond.assert_awaited_once_with(prop, **kwargs)
-
-        mock__exec_property_and_respond.reset_mock()
-        mock_parse_args.reset_mock()
-
-        bad_command = 'definitely not a function or property'
-        mock_parse_args.return_value = Namespace(**{CMD: bad_command}, **kwargs)
-        with patch.object(session, 'CommandError') as cmd_err_cls:
-            cmd_err_cls.return_value = exc = MagicMock()
-            self.assertIsNone(await self.session._parse_command(msg))
-            cmd_err_cls.assert_called_once_with(f"Unknown command object: {bad_command}")
-        mock_parse_args.assert_called_once_with(msg.split(' '))
-        mock__exec_method_and_respond.assert_not_called()
-        mock__exec_property_and_respond.assert_not_called()
-        self.assertEqual(str(exc), self.session._response_buffer.getvalue())
-
-        mock__exec_property_and_respond.reset_mock()
-        mock_parse_args.reset_mock()
-        self.session._response_buffer.seek(0)
-        self.session._response_buffer.truncate()
-
-        mock_parse_args.side_effect = exc = ArgumentError(MagicMock(), "oops")
-        self.assertIsNone(await self.session._parse_command(msg))
-        mock_parse_args.assert_called_once_with(msg.split(' '))
-        self.assertEqual(str(exc), self.session._response_buffer.getvalue())
-        mock__exec_method_and_respond.assert_not_awaited()
-        mock__exec_property_and_respond.assert_not_awaited()
-
-        mock_parse_args.reset_mock()
-        self.session._response_buffer.seek(0)
-        self.session._response_buffer.truncate()
-
-        mock_parse_args.side_effect = HelpRequested()
-        self.assertIsNone(await self.session._parse_command(msg))
-        mock_parse_args.assert_called_once_with(msg.split(' '))
-        self.assertEqual('', self.session._response_buffer.getvalue())
-        mock__exec_method_and_respond.assert_not_awaited()
-        mock__exec_property_and_respond.assert_not_awaited()
-
-    @patch.object(session.ControlSession, '_parse_command')
-    async def test_listen(self, mock__parse_command: AsyncMock):
-        def make_reader_return_empty():
-            self.mock_reader.readline.return_value = b''
-        self.mock_writer.drain = AsyncMock(side_effect=make_reader_return_empty)
-        msg = "fascinating"
-        self.mock_reader.readline = AsyncMock(return_value=f' {msg} '.encode())
-        response = FOO + BAR + FOO
-        self.session._response_buffer.write(response)
-        self.assertIsNone(await self.session.listen())
-        self.mock_reader.readline.assert_has_awaits([call(), call()])
-        mock__parse_command.assert_awaited_once_with(msg)
-        self.assertEqual('', self.session._response_buffer.getvalue())
-        self.mock_writer.write.assert_called_once_with(response.encode() + b'\n')
-        self.mock_writer.drain.assert_awaited_once_with()
-
-        self.mock_reader.readline.reset_mock()
-        mock__parse_command.reset_mock()
-        self.mock_writer.write.reset_mock()
-        self.mock_writer.drain.reset_mock()
-
-        self.mock_server.is_serving = MagicMock(return_value=False)
-        self.assertIsNone(await self.session.listen())
-        self.mock_reader.readline.assert_not_awaited()
-        mock__parse_command.assert_not_awaited()
-        self.mock_writer.write.assert_not_called()
-        self.mock_writer.drain.assert_not_awaited()
--- a/tests/test_internals/test_helpers.py
+++ b/tests/test_internals/test_helpers.py
@ -18,12 +18,11 @@ __doc__ = """
 Unittests for the `asyncio_taskpool.helpers` module.
 """

-import importlib
-from unittest import IsolatedAsyncioTestCase, TestCase
-from unittest.mock import MagicMock, AsyncMock, NonCallableMagicMock, call, patch

-from asyncio_taskpool.internals import constants
-from asyncio_taskpool.internals import helpers
+from unittest import IsolatedAsyncioTestCase
+from unittest.mock import MagicMock, AsyncMock, NonCallableMagicMock
+
+from asyncio_taskpool import helpers


 class HelpersTestCase(IsolatedAsyncioTestCase):
@ -82,6 +81,20 @@ class HelpersTestCase(IsolatedAsyncioTestCase):
        with self.assertRaises(ValueError):
            helpers.star_function(f, a, 123456789)

+    async def test_join_queue(self):
+        mock_join = AsyncMock()
+        mock_queue = MagicMock(join=mock_join)
+        self.assertIsNone(await helpers.join_queue(mock_queue))
+        mock_join.assert_awaited_once_with()
+
+    def test_task_str(self):
+        self.assertEqual("task", helpers.tasks_str(1))
+        self.assertEqual("tasks", helpers.tasks_str(0))
+        self.assertEqual("tasks", helpers.tasks_str(-1))
+        self.assertEqual("tasks", helpers.tasks_str(2))
+        self.assertEqual("tasks", helpers.tasks_str(-10))
+        self.assertEqual("tasks", helpers.tasks_str(42))
+
    def test_get_first_doc_line(self):
        expected_output = 'foo bar baz'
        mock_obj = MagicMock(__doc__=f"""{expected_output} 
@ -113,55 +126,3 @@ class HelpersTestCase(IsolatedAsyncioTestCase):
        output = await helpers.return_or_exception(mock_func, *args, **kwargs)
        self.assertEqual(test_exception, output)
        mock_func.assert_called_once_with(*args, **kwargs)
-
-    def test_resolve_dotted_path(self):
-        from logging import WARNING
-        from urllib.request import urlopen
-        self.assertEqual(WARNING, helpers.resolve_dotted_path('logging.WARNING'))
-        self.assertEqual(urlopen, helpers.resolve_dotted_path('urllib.request.urlopen'))
-        with patch.object(helpers, 'import_module', return_value=object) as mock_import_module:
-            with self.assertRaises(AttributeError):
-                helpers.resolve_dotted_path('foo.bar.baz')
-            mock_import_module.assert_has_calls([call('foo'), call('foo.bar')])
-
-
-class ClassMethodWorkaroundTestCase(TestCase):
-    def test_init(self):
-        def func(): return 'foo'
-        def getter(): return 'bar'
-        prop = property(getter)
-        instance = helpers.ClassMethodWorkaround(func)
-        self.assertIs(func, instance._getter)
-        instance = helpers.ClassMethodWorkaround(prop)
-        self.assertIs(getter, instance._getter)
-
-    @patch.object(helpers.ClassMethodWorkaround, '__init__', return_value=None)
-    def test_get(self, _mock_init: MagicMock):
-        def func(x: MagicMock): return x.__name__
-        instance = helpers.ClassMethodWorkaround(MagicMock())
-        instance._getter = func
-        obj, cls = None, MagicMock
-        expected_output = 'MagicMock'
-        output = instance.__get__(obj, cls)
-        self.assertEqual(expected_output, output)
-
-        obj = MagicMock(__name__='bar')
-        expected_output = 'bar'
-        output = instance.__get__(obj, cls)
-        self.assertEqual(expected_output, output)
-
-        cls = None
-        output = instance.__get__(obj, cls)
-        self.assertEqual(expected_output, output)
-
-    def test_correct_class(self):
-        is_older_python = constants.PYTHON_BEFORE_39
-        try:
-            constants.PYTHON_BEFORE_39 = True
-            importlib.reload(helpers)
-            self.assertIs(helpers.ClassMethodWorkaround, helpers.classmethod)
-            constants.PYTHON_BEFORE_39 = False
-            importlib.reload(helpers)
-            self.assertIs(classmethod, helpers.classmethod)
-        finally:
-            constants.PYTHON_BEFORE_39 = is_older_python
--- a/tests/test_internals/init.py
+++ b/tests/test_internals/init.py
--- a/tests/test_internals/test_group_register.py
+++ b/tests/test_internals/test_group_register.py
@ -1,84 +0,0 @@
-__author__ = "Daniil Fajnberg"
-__copyright__ = "Copyright © 2022 Daniil Fajnberg"
-__license__ = """GNU LGPLv3.0
-
-This file is part of asyncio-taskpool.
-
-asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-asyncio-taskpool 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 Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
-If not, see <https://www.gnu.org/licenses/>."""
-
-__doc__ = """
-Unittests for the `asyncio_taskpool.group_register` module.
-"""
-
-
-from asyncio.locks import Lock
-from unittest import IsolatedAsyncioTestCase
-from unittest.mock import MagicMock, patch
-
-from asyncio_taskpool.internals import group_register
-
-FOO, BAR = 'foo', 'bar'
-
-
-class TaskGroupRegisterTestCase(IsolatedAsyncioTestCase):
-    def setUp(self) -> None:
-        self.reg = group_register.TaskGroupRegister()
-
-    def test_init(self):
-        ids = [FOO, BAR, 1, 2]
-        reg = group_register.TaskGroupRegister(*ids)
-        self.assertSetEqual(set(ids), reg._ids)
-        self.assertIsInstance(reg._lock, Lock)
-
-    def test___contains__(self):
-        self.reg._ids = {1, 2, 3}
-        for i in self.reg._ids:
-            self.assertTrue(i in self.reg)
-        self.assertFalse(4 in self.reg)
-
-    @patch.object(group_register, 'iter', return_value=FOO)
-    def test___iter__(self, mock_iter: MagicMock):
-        self.assertEqual(FOO, self.reg.__iter__())
-        mock_iter.assert_called_once_with(self.reg._ids)
-
-    def test___len__(self):
-        self.reg._ids = [1, 2, 3, 4]
-        self.assertEqual(4, len(self.reg))
-
-    def test_add(self):
-        self.assertSetEqual(set(), self.reg._ids)
-        self.assertIsNone(self.reg.add(123))
-        self.assertSetEqual({123}, self.reg._ids)
-
-    def test_discard(self):
-        self.reg._ids = {123}
-        self.assertIsNone(self.reg.discard(0))
-        self.assertIsNone(self.reg.discard(999))
-        self.assertIsNone(self.reg.discard(123))
-        self.assertSetEqual(set(), self.reg._ids)
-
-    async def test_acquire(self):
-        self.assertFalse(self.reg._lock.locked())
-        await self.reg.acquire()
-        self.assertTrue(self.reg._lock.locked())
-
-    def test_release(self):
-        self.reg._lock._locked = True
-        self.assertTrue(self.reg._lock.locked())
-        self.reg.release()
-        self.assertFalse(self.reg._lock.locked())
-
-    async def test_contextmanager(self):
-        self.assertFalse(self.reg._lock.locked())
-        async with self.reg as nothing:
-            self.assertIsNone(nothing)
-            self.assertTrue(self.reg._lock.locked())
-        self.assertFalse(self.reg._lock.locked())
--- a/tests/test_pool.py
+++ b/tests/test_pool.py
@ -19,12 +19,15 @@ Unittests for the `asyncio_taskpool.pool` module.
 """

 from asyncio.exceptions import CancelledError
-from asyncio.locks import Event, Semaphore
+from asyncio.locks import Semaphore
+from asyncio.queues import QueueEmpty
+from datetime import datetime
 from unittest import IsolatedAsyncioTestCase
 from unittest.mock import PropertyMock, MagicMock, AsyncMock, patch, call
 from typing import Type

 from asyncio_taskpool import pool, exceptions
+from asyncio_taskpool.constants import DATETIME_FORMAT


 EMPTY_LIST, EMPTY_DICT, EMPTY_SET = [], {}, set()
@ -81,22 +84,20 @@ class BaseTaskPoolTestCase(CommonTestCase):

    def test_init(self):
        self.assertEqual(0, self.task_pool._num_started)
+        self.assertEqual(0, self.task_pool._num_cancellations)

        self.assertFalse(self.task_pool._locked)
-        self.assertIsInstance(self.task_pool._closed, Event)
-        self.assertFalse(self.task_pool._closed.is_set())
+        self.assertFalse(self.task_pool._closed)
        self.assertEqual(self.TEST_POOL_NAME, self.task_pool._name)

        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_running)
        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_cancelled)
        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_ended)

+        self.assertListEqual(self.task_pool._before_gathering, EMPTY_LIST)
        self.assertIsInstance(self.task_pool._enough_room, Semaphore)
        self.assertDictEqual(EMPTY_DICT, self.task_pool._task_groups)

-        self.assertDictEqual(EMPTY_DICT, self.task_pool._group_meta_tasks_running)
-        self.assertSetEqual(EMPTY_SET, self.task_pool._meta_tasks_cancelled)
-
        self.assertEqual(self.mock_idx, self.task_pool._idx)

        self.mock__add_pool.assert_called_once_with(self.task_pool)
@ -113,14 +114,14 @@ class BaseTaskPoolTestCase(CommonTestCase):

    def test_pool_size(self):
        self.pool_size_patcher.stop()
-        self.task_pool._enough_room._value = self.TEST_POOL_SIZE
+        self.task_pool._pool_size = self.TEST_POOL_SIZE
        self.assertEqual(self.TEST_POOL_SIZE, self.task_pool.pool_size)

        with self.assertRaises(ValueError):
            self.task_pool.pool_size = -1

        self.task_pool.pool_size = new_size = 69
-        self.assertEqual(new_size, self.task_pool._enough_room._value)
+        self.assertEqual(new_size, self.task_pool._pool_size)

    def test_is_locked(self):
        self.task_pool._locked = FOO
@ -144,26 +145,33 @@ class BaseTaskPoolTestCase(CommonTestCase):
        self.task_pool._tasks_running = {1: FOO, 2: BAR, 3: BAZ}
        self.assertEqual(3, self.task_pool.num_running)

-    def test_num_cancelled(self):
-        self.task_pool._tasks_cancelled = {1: FOO, 2: BAR, 3: BAZ}
-        self.assertEqual(3, self.task_pool.num_cancelled)
+    def test_num_cancellations(self):
+        self.task_pool._num_cancellations = 3
+        self.assertEqual(3, self.task_pool.num_cancellations)

    def test_num_ended(self):
        self.task_pool._tasks_ended = {1: FOO, 2: BAR, 3: BAZ}
        self.assertEqual(3, self.task_pool.num_ended)

+    def test_num_finished(self):
+        self.task_pool._num_cancellations = num_cancellations = 69
+        num_ended = 420
+        self.task_pool._tasks_ended = {i: FOO for i in range(num_ended)}
+        self.task_pool._tasks_cancelled = mock_cancelled_dict = {1: FOO, 2: BAR, 3: BAZ}
+        self.assertEqual(num_ended - num_cancellations + len(mock_cancelled_dict), self.task_pool.num_finished)
+
    def test_is_full(self):
        self.assertEqual(self.task_pool._enough_room.locked(), self.task_pool.is_full)

-    def test_get_group_ids(self):
+    def test_get_task_group_ids(self):
        group_name, ids = 'abcdef', [1, 2, 3]
        self.task_pool._task_groups[group_name] = MagicMock(__iter__=lambda _: iter(ids))
-        self.assertEqual(set(ids), self.task_pool.get_group_ids(group_name))
+        self.assertEqual(set(ids), self.task_pool.get_task_group_ids(group_name))
        with self.assertRaises(exceptions.InvalidGroupName):
-            self.task_pool.get_group_ids(group_name, 'something else')
+            self.task_pool.get_task_group_ids('something else')

    async def test__check_start(self):
-        self.task_pool._closed.set()
+        self.task_pool._closed = True
        mock_coroutine, mock_coroutine_function = AsyncMock()(), AsyncMock()
        try:
            with self.assertRaises(AssertionError):
@ -176,7 +184,7 @@ class BaseTaskPoolTestCase(CommonTestCase):
                self.task_pool._check_start(awaitable=None, function=mock_coroutine)
            with self.assertRaises(exceptions.PoolIsClosed):
                self.task_pool._check_start(awaitable=mock_coroutine, function=None)
-            self.task_pool._closed.clear()
+            self.task_pool._closed = False
            self.task_pool._locked = True
            with self.assertRaises(exceptions.PoolIsLocked):
                self.task_pool._check_start(awaitable=mock_coroutine, function=None, ignore_lock=False)
@ -192,10 +200,12 @@ class BaseTaskPoolTestCase(CommonTestCase):
    @patch.object(pool.BaseTaskPool, '_task_name', return_value=FOO)
    async def test__task_cancellation(self, mock__task_name: MagicMock, mock_execute_optional: AsyncMock):
        task_id, mock_task, mock_callback = 1, MagicMock(), MagicMock()
+        self.task_pool._num_cancellations = cancelled = 3
        self.task_pool._tasks_running[task_id] = mock_task
        self.assertIsNone(await self.task_pool._task_cancellation(task_id, mock_callback))
        self.assertNotIn(task_id, self.task_pool._tasks_running)
        self.assertEqual(mock_task, self.task_pool._tasks_cancelled[task_id])
+        self.assertEqual(cancelled + 1, self.task_pool._num_cancellations)
        mock__task_name.assert_called_with(task_id)
        mock_execute_optional.assert_awaited_once_with(mock_callback, args=(task_id, ))

@ -312,32 +322,104 @@ class BaseTaskPoolTestCase(CommonTestCase):
            self.task_pool._get_running_task(task_id)
        mock__task_name.assert_not_called()

-    @patch('warnings.warn')
-    def test__get_cancel_kw(self, mock_warn: MagicMock):
-        msg = None
-        self.assertDictEqual(EMPTY_DICT, pool.BaseTaskPool._get_cancel_kw(msg))
-        mock_warn.assert_not_called()
-
-        msg = 'something'
-        with patch.object(pool, 'PYTHON_BEFORE_39', new=True):
-            self.assertDictEqual(EMPTY_DICT, pool.BaseTaskPool._get_cancel_kw(msg))
-            mock_warn.assert_called_once()
-        mock_warn.reset_mock()
-
-        with patch.object(pool, 'PYTHON_BEFORE_39', new=False):
-            self.assertDictEqual({'msg': msg}, pool.BaseTaskPool._get_cancel_kw(msg))
-            mock_warn.assert_not_called()
-
-    @patch.object(pool.BaseTaskPool, '_get_cancel_kw')
    @patch.object(pool.BaseTaskPool, '_get_running_task')
-    def test_cancel(self, mock__get_running_task: MagicMock, mock__get_cancel_kw: MagicMock):
-        mock__get_cancel_kw.return_value = fake_cancel_kw = {'a': 10, 'b': 20}
+    def test_cancel(self, mock__get_running_task: MagicMock):
        task_id1, task_id2, task_id3 = 1, 4, 9
        mock__get_running_task.return_value.cancel = mock_cancel = MagicMock()
        self.assertIsNone(self.task_pool.cancel(task_id1, task_id2, task_id3, msg=FOO))
        mock__get_running_task.assert_has_calls([call(task_id1), call(task_id2), call(task_id3)])
-        mock__get_cancel_kw.assert_called_once_with(FOO)
-        mock_cancel.assert_has_calls(3 * [call(**fake_cancel_kw)])
+        mock_cancel.assert_has_calls([call(msg=FOO), call(msg=FOO), call(msg=FOO)])
+
+    def test__cancel_and_remove_all_from_group(self):
+        task_id = 555
+        mock_cancel = MagicMock()
+        self.task_pool._tasks_running[task_id] = MagicMock(cancel=mock_cancel)
+
+        class MockRegister(set, MagicMock):
+            pass
+        self.assertIsNone(self.task_pool._cancel_and_remove_all_from_group(' ', MockRegister({task_id, 'x'}), msg=FOO))
+        mock_cancel.assert_called_once_with(msg=FOO)
+
+    @patch.object(pool.BaseTaskPool, '_cancel_and_remove_all_from_group')
+    async def test_cancel_group(self, mock__cancel_and_remove_all_from_group: MagicMock):
+        mock_grp_aenter, mock_grp_aexit = AsyncMock(), AsyncMock()
+        mock_group_reg = MagicMock(__aenter__=mock_grp_aenter, __aexit__=mock_grp_aexit)
+        self.task_pool._task_groups[FOO] = mock_group_reg
+        with self.assertRaises(exceptions.InvalidGroupName):
+            await self.task_pool.cancel_group(BAR)
+        mock__cancel_and_remove_all_from_group.assert_not_called()
+        mock_grp_aenter.assert_not_called()
+        mock_grp_aexit.assert_not_called()
+        self.assertIsNone(await self.task_pool.cancel_group(FOO, msg=BAR))
+        mock__cancel_and_remove_all_from_group.assert_called_once_with(FOO, mock_group_reg, msg=BAR)
+        mock_grp_aenter.assert_awaited_once_with()
+        mock_grp_aexit.assert_awaited_once()
+
+    @patch.object(pool.BaseTaskPool, '_cancel_and_remove_all_from_group')
+    async def test_cancel_all(self, mock__cancel_and_remove_all_from_group: MagicMock):
+        mock_grp_aenter, mock_grp_aexit = AsyncMock(), AsyncMock()
+        mock_group_reg = MagicMock(__aenter__=mock_grp_aenter, __aexit__=mock_grp_aexit)
+        self.task_pool._task_groups[BAR] = mock_group_reg
+        self.assertIsNone(await self.task_pool.cancel_all(FOO))
+        mock__cancel_and_remove_all_from_group.assert_called_once_with(BAR, mock_group_reg, msg=FOO)
+        mock_grp_aenter.assert_awaited_once_with()
+        mock_grp_aexit.assert_awaited_once()
+
+    async def test_flush(self):
+        mock_ended_func, mock_cancelled_func = AsyncMock(), AsyncMock(side_effect=Exception)
+        self.task_pool._tasks_ended = {123: mock_ended_func()}
+        self.task_pool._tasks_cancelled = {456: mock_cancelled_func()}
+        self.assertIsNone(await self.task_pool.flush(return_exceptions=True))
+        mock_ended_func.assert_awaited_once_with()
+        mock_cancelled_func.assert_awaited_once_with()
+        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_ended)
+        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_cancelled)
+
+    async def test_gather_and_close(self):
+        mock_before_gather, mock_running_func = AsyncMock(), AsyncMock()
+        mock_ended_func, mock_cancelled_func = AsyncMock(), AsyncMock(side_effect=Exception)
+        self.task_pool._before_gathering = before_gather = [mock_before_gather()]
+        self.task_pool._tasks_ended = ended = {123: mock_ended_func()}
+        self.task_pool._tasks_cancelled = cancelled = {456: mock_cancelled_func()}
+        self.task_pool._tasks_running = running = {789: mock_running_func()}
+
+        with self.assertRaises(exceptions.PoolStillUnlocked):
+            await self.task_pool.gather_and_close()
+        self.assertDictEqual(ended, self.task_pool._tasks_ended)
+        self.assertDictEqual(cancelled, self.task_pool._tasks_cancelled)
+        self.assertDictEqual(running, self.task_pool._tasks_running)
+        self.assertListEqual(before_gather, self.task_pool._before_gathering)
+        self.assertFalse(self.task_pool._closed)
+
+        self.task_pool._locked = True
+        self.assertIsNone(await self.task_pool.gather_and_close(return_exceptions=True))
+        mock_before_gather.assert_awaited_once_with()
+        mock_ended_func.assert_awaited_once_with()
+        mock_cancelled_func.assert_awaited_once_with()
+        mock_running_func.assert_awaited_once_with()
+        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_ended)
+        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_cancelled)
+        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_running)
+        self.assertListEqual(EMPTY_LIST, self.task_pool._before_gathering)
+        self.assertTrue(self.task_pool._closed)
+
+
+class TaskPoolTestCase(CommonTestCase):
+    TEST_CLASS = pool.TaskPool
+    task_pool: pool.TaskPool
+
+    def setUp(self) -> None:
+        self.base_class_init_patcher = patch.object(pool.BaseTaskPool, '__init__')
+        self.base_class_init = self.base_class_init_patcher.start()
+        super().setUp()
+
+    def tearDown(self) -> None:
+        self.base_class_init_patcher.stop()
+        super().tearDown()
+
+    def test_init(self):
+        self.assertDictEqual(EMPTY_DICT, self.task_pool._group_meta_tasks_running)
+        self.base_class_init.assert_called_once_with(pool_size=self.TEST_POOL_SIZE, name=self.TEST_POOL_NAME)

    def test__cancel_group_meta_tasks(self):
        mock_task1, mock_task2 = MagicMock(), MagicMock()
@ -354,48 +436,26 @@ class BaseTaskPoolTestCase(CommonTestCase):
        mock_task1.cancel.assert_called_once_with()
        mock_task2.cancel.assert_called_once_with()

-    @patch.object(pool.BaseTaskPool, '_cancel_group_meta_tasks')
-    def test__cancel_and_remove_all_from_group(self, mock__cancel_group_meta_tasks: MagicMock):
-        kw = {BAR: 10, BAZ: 20}
-        task_id = 555
-        mock_cancel = MagicMock()
-
-        def add_mock_task_to_running(_):
-            self.task_pool._tasks_running[task_id] = MagicMock(cancel=mock_cancel)
-        # We add the fake task to the `_tasks_running` dictionary as a side effect of calling the mocked method,
-        # to verify that it is called first, before the cancellation loop starts.
-        mock__cancel_group_meta_tasks.side_effect = add_mock_task_to_running
-
-        class MockRegister(set, MagicMock):
-            pass
-        self.assertIsNone(self.task_pool._cancel_and_remove_all_from_group(' ', MockRegister({task_id, 'x'}), **kw))
-        mock_cancel.assert_called_once_with(**kw)
-
-    @patch.object(pool.BaseTaskPool, '_get_cancel_kw')
    @patch.object(pool.BaseTaskPool, '_cancel_and_remove_all_from_group')
-    def test_cancel_group(self, mock__cancel_and_remove_all_from_group: MagicMock, mock__get_cancel_kw: MagicMock):
-        mock__get_cancel_kw.return_value = fake_cancel_kw = {'a': 10, 'b': 20}
-        self.task_pool._task_groups[FOO] = mock_group_reg = MagicMock()
-        with self.assertRaises(exceptions.InvalidGroupName):
-            self.task_pool.cancel_group(BAR)
-        mock__cancel_and_remove_all_from_group.assert_not_called()
-        self.assertIsNone(self.task_pool.cancel_group(FOO, msg=BAR))
-        self.assertDictEqual(EMPTY_DICT, self.task_pool._task_groups)
-        mock__get_cancel_kw.assert_called_once_with(BAR)
-        mock__cancel_and_remove_all_from_group.assert_called_once_with(FOO, mock_group_reg, **fake_cancel_kw)
+    @patch.object(pool.TaskPool, '_cancel_group_meta_tasks')
+    def test__cancel_and_remove_all_from_group(self, mock__cancel_group_meta_tasks: MagicMock,
+                                               mock_base__cancel_and_remove_all_from_group: MagicMock):
+        group_name, group_reg, msg = 'xyz', MagicMock(), FOO
+        self.assertIsNone(self.task_pool._cancel_and_remove_all_from_group(group_name, group_reg, msg=msg))
+        mock__cancel_group_meta_tasks.assert_called_once_with(group_name)
+        mock_base__cancel_and_remove_all_from_group.assert_called_once_with(group_name, group_reg, msg=msg)

-    @patch.object(pool.BaseTaskPool, '_get_cancel_kw')
-    @patch.object(pool.BaseTaskPool, '_cancel_and_remove_all_from_group')
-    def test_cancel_all(self, mock__cancel_and_remove_all_from_group: MagicMock, mock__get_cancel_kw: MagicMock):
-        mock__get_cancel_kw.return_value = fake_cancel_kw = {'a': 10, 'b': 20}
-        mock_group_reg = MagicMock()
-        self.task_pool._task_groups = {FOO: mock_group_reg, BAR: mock_group_reg}
-        self.assertIsNone(self.task_pool.cancel_all(BAZ))
-        mock__get_cancel_kw.assert_called_once_with(BAZ)
-        mock__cancel_and_remove_all_from_group.assert_has_calls([
-            call(BAR, mock_group_reg, **fake_cancel_kw),
-            call(FOO, mock_group_reg, **fake_cancel_kw)
-        ])
+    @patch.object(pool.BaseTaskPool, 'cancel_group')
+    async def test_cancel_group(self, mock_base_cancel_group: AsyncMock):
+        group_name, msg = 'abc', 'xyz'
+        await self.task_pool.cancel_group(group_name, msg=msg)
+        mock_base_cancel_group.assert_awaited_once_with(group_name=group_name, msg=msg)
+
+    @patch.object(pool.BaseTaskPool, 'cancel_all')
+    async def test_cancel_all(self, mock_base_cancel_all: AsyncMock):
+        msg = 'xyz'
+        await self.task_pool.cancel_all(msg=msg)
+        mock_base_cancel_all.assert_awaited_once_with(msg=msg)

    def test__pop_ended_meta_tasks(self):
        mock_task, mock_done_task1 = MagicMock(done=lambda: False), MagicMock(done=lambda: True)
@ -407,162 +467,131 @@ class BaseTaskPoolTestCase(CommonTestCase):
        self.assertSetEqual(expected_output, output)
        self.assertDictEqual({FOO: {mock_task}}, self.task_pool._group_meta_tasks_running)

-    @patch.object(pool.BaseTaskPool, '_pop_ended_meta_tasks')
-    async def test_flush(self, mock__pop_ended_meta_tasks: MagicMock):
-        # Meta tasks:
+    @patch.object(pool.TaskPool, '_pop_ended_meta_tasks')
+    @patch.object(pool.BaseTaskPool, 'flush')
+    async def test_flush(self, mock_base_flush: AsyncMock, mock__pop_ended_meta_tasks: MagicMock):
        mock_ended_meta_task = AsyncMock()
        mock__pop_ended_meta_tasks.return_value = {mock_ended_meta_task()}
        mock_cancelled_meta_task = AsyncMock(side_effect=CancelledError)
        self.task_pool._meta_tasks_cancelled = {mock_cancelled_meta_task()}
-        # Actual tasks:
-        mock_ended_func, mock_cancelled_func = AsyncMock(), AsyncMock(side_effect=Exception)
-        self.task_pool._tasks_ended = {123: mock_ended_func()}
-        self.task_pool._tasks_cancelled = {456: mock_cancelled_func()}
-
-        self.assertIsNone(await self.task_pool.flush(return_exceptions=True))
-
-        # Meta tasks:
+        self.assertIsNone(await self.task_pool.flush(return_exceptions=False))
+        mock_base_flush.assert_awaited_once_with(return_exceptions=False)
        mock__pop_ended_meta_tasks.assert_called_once_with()
        mock_ended_meta_task.assert_awaited_once_with()
        mock_cancelled_meta_task.assert_awaited_once_with()
        self.assertSetEqual(EMPTY_SET, self.task_pool._meta_tasks_cancelled)
-        # Actual tasks:
-        mock_ended_func.assert_awaited_once_with()
-        mock_cancelled_func.assert_awaited_once_with()
-        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_ended)
-        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_cancelled)

-    @patch.object(pool.BaseTaskPool, 'lock')
-    async def test_gather_and_close(self, mock_lock: MagicMock):
-        # Meta tasks:
+    @patch.object(pool.BaseTaskPool, 'gather_and_close')
+    async def test_gather_and_close(self, mock_base_gather_and_close: AsyncMock):
        mock_meta_task1, mock_meta_task2 = AsyncMock(), AsyncMock()
        self.task_pool._group_meta_tasks_running = {FOO: {mock_meta_task1()}, BAR: {mock_meta_task2()}}
        mock_cancelled_meta_task = AsyncMock(side_effect=CancelledError)
        self.task_pool._meta_tasks_cancelled = {mock_cancelled_meta_task()}
-        # Actual tasks:
-        mock_running_func = AsyncMock()
-        mock_ended_func, mock_cancelled_func = AsyncMock(), AsyncMock(side_effect=Exception)
-        self.task_pool._tasks_ended = {123: mock_ended_func()}
-        self.task_pool._tasks_cancelled = {456: mock_cancelled_func()}
-        self.task_pool._tasks_running = {789: mock_running_func()}
-
        self.assertIsNone(await self.task_pool.gather_and_close(return_exceptions=True))
-
-        mock_lock.assert_called_once_with()
-        # Meta tasks:
+        mock_base_gather_and_close.assert_awaited_once_with(return_exceptions=True)
        mock_meta_task1.assert_awaited_once_with()
        mock_meta_task2.assert_awaited_once_with()
        mock_cancelled_meta_task.assert_awaited_once_with()
        self.assertDictEqual(EMPTY_DICT, self.task_pool._group_meta_tasks_running)
        self.assertSetEqual(EMPTY_SET, self.task_pool._meta_tasks_cancelled)
-        # Actual tasks:
-        mock_ended_func.assert_awaited_once_with()
-        mock_cancelled_func.assert_awaited_once_with()
-        mock_running_func.assert_awaited_once_with()
-        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_ended)
-        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_cancelled)
-        self.assertDictEqual(EMPTY_DICT, self.task_pool._tasks_running)
-        self.assertTrue(self.task_pool._closed.is_set())

-    async def test_until_closed(self):
-        self.task_pool._closed = MagicMock(wait=AsyncMock(return_value=FOO))
-        output = await self.task_pool.until_closed()
-        self.assertEqual(FOO, output)
-        self.task_pool._closed.wait.assert_awaited_once_with()
-
-
-class TaskPoolTestCase(CommonTestCase):
-    TEST_CLASS = pool.TaskPool
-    task_pool: pool.TaskPool
-
-    def test__generate_group_name(self):
+    @patch.object(pool, 'datetime')
+    def test__generate_group_name(self, mock_datetime: MagicMock):
        prefix, func = 'x y z', AsyncMock(__name__=BAR)
-        base_name = f'{prefix}-{BAR}-group'
-        self.task_pool._task_groups = {
-            f'{base_name}-0': MagicMock(),
-            f'{base_name}-1': MagicMock(),
-            f'{base_name}-100': MagicMock(),
-        }
-        expected_output = f'{base_name}-2'
-        output = self.task_pool._generate_group_name(prefix, func)
+        dt = datetime(1776, 7, 4, 0, 0, 1)
+        mock_datetime.now = MagicMock(return_value=dt)
+        expected_output = f'{prefix}_{BAR}_{dt.strftime(DATETIME_FORMAT)}'
+        output = pool.TaskPool._generate_group_name(prefix, func)
        self.assertEqual(expected_output, output)

    @patch.object(pool.TaskPool, '_start_task')
-    async def test__apply_spawner(self, mock__start_task: AsyncMock):
-        grp_name = FOO + BAR
-        mock_awaitable1, mock_awaitable2 = object(), object()
-        mock_func = MagicMock(side_effect=[mock_awaitable1, Exception(), mock_awaitable2], __name__='func')
-        args, kw, num = (FOO, BAR), {'a': 1, 'b': 2}, 3
+    async def test__apply_num(self, mock__start_task: AsyncMock):
+        group_name = FOO + BAR
+        mock_awaitable = object()
+        mock_func = MagicMock(return_value=mock_awaitable)
+        args, kwargs, num = (FOO, BAR), {'a': 1, 'b': 2}, 3
        end_cb, cancel_cb = MagicMock(), MagicMock()
-        self.assertIsNone(await self.task_pool._apply_spawner(grp_name, mock_func, args, kw, num, end_cb, cancel_cb))
-        mock_func.assert_has_calls(num * [call(*args, **kw)])
-        mock__start_task.assert_has_awaits([
-            call(mock_awaitable1, group_name=grp_name, end_callback=end_cb, cancel_callback=cancel_cb),
-            call(mock_awaitable2, group_name=grp_name, end_callback=end_cb, cancel_callback=cancel_cb),
+        self.assertIsNone(await self.task_pool._apply_num(group_name, mock_func, args, kwargs, num, end_cb, cancel_cb))
+        mock_func.assert_has_calls(3 * [call(*args, **kwargs)])
+        mock__start_task.assert_has_awaits(3 * [
+            call(mock_awaitable, group_name=group_name, end_callback=end_cb, cancel_callback=cancel_cb)
        ])

-        mock_func.reset_mock(side_effect=True)
+        mock_func.reset_mock()
        mock__start_task.reset_mock()

-        # Simulate cancellation while the second task is being started.
-        mock__start_task.side_effect = [None, CancelledError, None]
-        mock_coroutine_to_close = MagicMock()
-        mock_func.side_effect = [mock_awaitable1, mock_coroutine_to_close, 'never called']
-        self.assertIsNone(await self.task_pool._apply_spawner(grp_name, mock_func, args, None, num, end_cb, cancel_cb))
-        mock_func.assert_has_calls(2 * [call(*args)])
-        mock__start_task.assert_has_awaits([
-            call(mock_awaitable1, group_name=grp_name, end_callback=end_cb, cancel_callback=cancel_cb),
-            call(mock_coroutine_to_close, group_name=grp_name, end_callback=end_cb, cancel_callback=cancel_cb),
+        self.assertIsNone(await self.task_pool._apply_num(group_name, mock_func, args, None, num, end_cb, cancel_cb))
+        mock_func.assert_has_calls(num * [call(*args)])
+        mock__start_task.assert_has_awaits(num * [
+            call(mock_awaitable, group_name=group_name, end_callback=end_cb, cancel_callback=cancel_cb)
        ])
-        mock_coroutine_to_close.close.assert_called_once_with()

    @patch.object(pool, 'create_task')
-    @patch.object(pool.TaskPool, '_apply_spawner', new_callable=MagicMock())
+    @patch.object(pool.TaskPool, '_apply_num', new_callable=MagicMock())
    @patch.object(pool, 'TaskGroupRegister')
    @patch.object(pool.TaskPool, '_generate_group_name')
    @patch.object(pool.BaseTaskPool, '_check_start')
-    def test_apply(self, mock__check_start: MagicMock, mock__generate_group_name: MagicMock,
-                   mock_reg_cls: MagicMock, mock__apply_spawner: MagicMock, mock_create_task: MagicMock):
+    async def test_apply(self, mock__check_start: MagicMock, mock__generate_group_name: MagicMock,
+                         mock_reg_cls: MagicMock, mock__apply_num: MagicMock, mock_create_task: MagicMock):
        mock__generate_group_name.return_value = generated_name = 'name 123'
        mock_group_reg = set_up_mock_group_register(mock_reg_cls)
-        mock__apply_spawner.return_value = mock_apply_coroutine = object()
-        mock_create_task.return_value = fake_task = object()
+        mock__apply_num.return_value = mock_apply_coroutine = object()
+        mock_task_future = AsyncMock()
+        mock_create_task.return_value = mock_task_future()
        mock_func, num, group_name = MagicMock(), 3, FOO + BAR
        args, kwargs = (FOO, BAR), {'a': 1, 'b': 2}
        end_cb, cancel_cb = MagicMock(), MagicMock()
-
-        self.task_pool._task_groups = {group_name: 'causes error'}
-        with self.assertRaises(exceptions.InvalidGroupName):
-            self.task_pool.apply(mock_func, args, kwargs, num, group_name, end_cb, cancel_cb)
-        mock__check_start.assert_called_once_with(function=mock_func)
-        mock__apply_spawner.assert_not_called()
-        mock_create_task.assert_not_called()
-
-        mock__check_start.reset_mock()
        self.task_pool._task_groups = {}

        def check_assertions(_group_name, _output):
            self.assertEqual(_group_name, _output)
            mock__check_start.assert_called_once_with(function=mock_func)
            self.assertEqual(mock_group_reg, self.task_pool._task_groups[_group_name])
-            mock__apply_spawner.assert_called_once_with(_group_name, mock_func, args, kwargs, num,
-                                                        end_callback=end_cb, cancel_callback=cancel_cb)
+            mock_group_reg.__aenter__.assert_awaited_once_with()
+            mock__apply_num.assert_called_once_with(_group_name, mock_func, args, kwargs, num, end_cb, cancel_cb)
            mock_create_task.assert_called_once_with(mock_apply_coroutine)
-            self.assertSetEqual({fake_task}, self.task_pool._group_meta_tasks_running[group_name])
+            mock_group_reg.__aexit__.assert_awaited_once()
+            mock_task_future.assert_awaited_once_with()

-        output = self.task_pool.apply(mock_func, args, kwargs, num, group_name, end_cb, cancel_cb)
+        output = await self.task_pool.apply(mock_func, args, kwargs, num, group_name, end_cb, cancel_cb)
        check_assertions(group_name, output)
        mock__generate_group_name.assert_not_called()

        mock__check_start.reset_mock()
        self.task_pool._task_groups.clear()
-        mock__apply_spawner.reset_mock()
+        mock_group_reg.__aenter__.reset_mock()
+        mock__apply_num.reset_mock()
        mock_create_task.reset_mock()
+        mock_group_reg.__aexit__.reset_mock()
+        mock_task_future = AsyncMock()
+        mock_create_task.return_value = mock_task_future()

-        output = self.task_pool.apply(mock_func, args, kwargs, num, None, end_cb, cancel_cb)
+        output = await self.task_pool.apply(mock_func, args, kwargs, num, None, end_cb, cancel_cb)
        check_assertions(generated_name, output)
        mock__generate_group_name.assert_called_once_with('apply', mock_func)

+    @patch.object(pool, 'Queue')
+    async def test__queue_producer(self, mock_queue_cls: MagicMock):
+        mock_put = AsyncMock()
+        mock_queue_cls.return_value = mock_queue = MagicMock(put=mock_put)
+        item1, item2, item3 = FOO, 420, 69
+        arg_iter = iter([item1, item2, item3])
+        self.assertIsNone(await self.task_pool._queue_producer(mock_queue, arg_iter, FOO + BAR))
+        mock_put.assert_has_awaits([call(item1), call(item2), call(item3), call(pool.TaskPool._QUEUE_END_SENTINEL)])
+        with self.assertRaises(StopIteration):
+            next(arg_iter)
+
+        mock_put.reset_mock()
+
+        mock_put.side_effect = [CancelledError, None]
+        arg_iter = iter([item1, item2, item3])
+        mock_queue.get_nowait.side_effect = [item2, item3, QueueEmpty]
+        self.assertIsNone(await self.task_pool._queue_producer(mock_queue, arg_iter, FOO + BAR))
+        mock_put.assert_has_awaits([call(item1), call(pool.TaskPool._QUEUE_END_SENTINEL)])
+        mock_queue.get_nowait.assert_has_calls([call(), call(), call()])
+        mock_queue.item_processed.assert_has_calls([call(), call()])
+        self.assertListEqual([item2, item3], list(arg_iter))
+
    @patch.object(pool, 'execute_optional')
    async def test__get_map_end_callback(self, mock_execute_optional: AsyncMock):
        semaphore, mock_end_cb = Semaphore(1), MagicMock()
@ -574,179 +603,141 @@ class TaskPoolTestCase(CommonTestCase):

    @patch.object(pool, 'star_function')
    @patch.object(pool.TaskPool, '_start_task')
-    @patch.object(pool.TaskPool, '_get_map_end_callback')
    @patch.object(pool, 'Semaphore')
-    async def test__queue_consumer(self, mock_semaphore_cls: MagicMock, mock__get_map_end_callback: MagicMock,
+    @patch.object(pool.TaskPool, '_get_map_end_callback')
+    async def test__queue_consumer(self, mock__get_map_end_callback: MagicMock, mock_semaphore_cls: MagicMock,
                                   mock__start_task: AsyncMock, mock_star_function: MagicMock):
-        n = 2
-        mock_semaphore_cls.return_value = semaphore = Semaphore(n)
        mock__get_map_end_callback.return_value = map_cb = MagicMock()
-        awaitable1, awaitable2 = 'totally an awaitable', object()
-        mock_star_function.side_effect = [awaitable1, Exception(), awaitable2]
-        arg1, arg2, bad = 123456789, 'function argument', None
-        args = [arg1, bad, arg2]
-        grp_name, mock_func, stars = 'whatever', MagicMock(__name__="mock"), 3
+        mock_semaphore_cls.return_value = semaphore = Semaphore(3)
+        mock_star_function.return_value = awaitable = 'totally an awaitable'
+        arg1, arg2 = 123456789, 'function argument'
+        mock_q_maxsize = 3
+        mock_q = MagicMock(__aenter__=AsyncMock(side_effect=[arg1, arg2, pool.TaskPool._QUEUE_END_SENTINEL]),
+                           __aexit__=AsyncMock(), maxsize=mock_q_maxsize)
+        group_name, mock_func, stars = 'whatever', MagicMock(), 3
        end_cb, cancel_cb = MagicMock(), MagicMock()
-        self.assertIsNone(await self.task_pool._arg_consumer(grp_name, n, mock_func, args, stars, end_cb, cancel_cb))
-        # We initialized the semaphore with a value of 2. It should have been acquired twice. We expect it be locked.
+        self.assertIsNone(await self.task_pool._queue_consumer(mock_q, group_name, mock_func, stars, end_cb, cancel_cb))
        self.assertTrue(semaphore.locked())
-        mock_semaphore_cls.assert_called_once_with(n)
        mock__get_map_end_callback.assert_called_once_with(semaphore, actual_end_callback=end_cb)
-        mock__start_task.assert_has_awaits([
-            call(awaitable1, group_name=grp_name, ignore_lock=True, end_callback=map_cb, cancel_callback=cancel_cb),
-            call(awaitable2, group_name=grp_name, ignore_lock=True, end_callback=map_cb, cancel_callback=cancel_cb),
-        ])
-        mock_star_function.assert_has_calls([
-            call(mock_func, arg1, arg_stars=stars),
-            call(mock_func, bad, arg_stars=stars),
-            call(mock_func, arg2, arg_stars=stars)
-        ])
-
-        mock_semaphore_cls.reset_mock()
-        mock__get_map_end_callback.reset_mock()
-        mock__start_task.reset_mock()
-        mock_star_function.reset_mock(side_effect=True)
-
-        # With a CancelledError thrown while acquiring the semaphore:
-        mock_acquire = AsyncMock(side_effect=[True, CancelledError])
-        mock_semaphore_cls.return_value = mock_semaphore = MagicMock(acquire=mock_acquire)
-        mock_star_function.return_value = mock_coroutine = MagicMock()
-        arg_it = iter(arg for arg in (arg1, arg2, FOO))
-        self.assertIsNone(await self.task_pool._arg_consumer(grp_name, n, mock_func, arg_it, stars, end_cb, cancel_cb))
-        mock_semaphore_cls.assert_called_once_with(n)
-        mock__get_map_end_callback.assert_called_once_with(mock_semaphore, actual_end_callback=end_cb)
-        mock_star_function.assert_has_calls([
-            call(mock_func, arg1, arg_stars=stars),
-            call(mock_func, arg2, arg_stars=stars)
-        ])
-        mock_acquire.assert_has_awaits([call(), call()])
-        mock__start_task.assert_awaited_once_with(mock_coroutine, group_name=grp_name, ignore_lock=True,
-                                                  end_callback=map_cb, cancel_callback=cancel_cb)
-        mock_coroutine.close.assert_called_once_with()
-        mock_semaphore.release.assert_not_called()
-        self.assertEqual(FOO, next(arg_it))
-
-        mock_acquire.reset_mock(side_effect=True)
-        mock_semaphore_cls.reset_mock()
-        mock__get_map_end_callback.reset_mock()
-        mock__start_task.reset_mock()
-        mock_star_function.reset_mock(side_effect=True)
-
-        # With a CancelledError thrown while starting the task:
-        mock__start_task.side_effect = [None, CancelledError]
-        arg_it = iter(arg for arg in (arg1, arg2, FOO))
-        self.assertIsNone(await self.task_pool._arg_consumer(grp_name, n, mock_func, arg_it, stars, end_cb, cancel_cb))
-        mock_semaphore_cls.assert_called_once_with(n)
-        mock__get_map_end_callback.assert_called_once_with(mock_semaphore, actual_end_callback=end_cb)
-        mock_star_function.assert_has_calls([
-            call(mock_func, arg1, arg_stars=stars),
-            call(mock_func, arg2, arg_stars=stars)
-        ])
-        mock_acquire.assert_has_awaits([call(), call()])
        mock__start_task.assert_has_awaits(2 * [
-            call(mock_coroutine, group_name=grp_name, ignore_lock=True, end_callback=map_cb, cancel_callback=cancel_cb)
+            call(awaitable, group_name=group_name, ignore_lock=True, end_callback=map_cb, cancel_callback=cancel_cb)
+        ])
+        mock_star_function.assert_has_calls([
+            call(mock_func, arg1, arg_stars=stars),
+            call(mock_func, arg2, arg_stars=stars)
        ])
-        mock_coroutine.close.assert_called_once_with()
-        mock_semaphore.release.assert_called_once_with()
-        self.assertEqual(FOO, next(arg_it))

    @patch.object(pool, 'create_task')
-    @patch.object(pool.TaskPool, '_arg_consumer', new_callable=MagicMock)
+    @patch.object(pool.TaskPool, '_queue_consumer', new_callable=MagicMock)
+    @patch.object(pool.TaskPool, '_queue_producer', new_callable=MagicMock)
+    @patch.object(pool, 'join_queue', new_callable=MagicMock)
+    @patch.object(pool, 'Queue')
    @patch.object(pool, 'TaskGroupRegister')
    @patch.object(pool.BaseTaskPool, '_check_start')
-    def test__map(self, mock__check_start: MagicMock, mock_reg_cls: MagicMock, mock__arg_consumer: MagicMock,
+    async def test__map(self, mock__check_start: MagicMock, mock_reg_cls: MagicMock, mock_queue_cls: MagicMock,
+                        mock_join_queue: MagicMock, mock__queue_producer: MagicMock, mock__queue_consumer: MagicMock,
                        mock_create_task: MagicMock):
        mock_group_reg = set_up_mock_group_register(mock_reg_cls)
-        mock__arg_consumer.return_value = fake_consumer = object()
-        mock_create_task.return_value = fake_task = object()
+        mock_queue_cls.return_value = mock_q = MagicMock()
+        mock_join_queue.return_value = fake_join = object()
+        mock__queue_producer.return_value = fake_producer = object()
+        mock__queue_consumer.return_value = fake_consumer = object()
+        fake_task1, fake_task2 = object(), object()
+        mock_create_task.side_effect = [fake_task1, fake_task2]

-        group_name, n = 'onetwothree', 0
+        group_name, group_size = 'onetwothree', 0
        func, arg_iter, stars = AsyncMock(), [55, 66, 77], 3
        end_cb, cancel_cb = MagicMock(), MagicMock()

        with self.assertRaises(ValueError):
-            self.task_pool._map(group_name, n, func, arg_iter, stars, end_cb, cancel_cb)
+            await self.task_pool._map(group_name, group_size, func, arg_iter, stars, end_cb, cancel_cb)
        mock__check_start.assert_called_once_with(function=func)

        mock__check_start.reset_mock()

-        n = 1234
+        group_size = 1234
        self.task_pool._task_groups = {group_name: MagicMock()}

        with self.assertRaises(exceptions.InvalidGroupName):
-            self.task_pool._map(group_name, n, func, arg_iter, stars, end_cb, cancel_cb)
+            await self.task_pool._map(group_name, group_size, func, arg_iter, stars, end_cb, cancel_cb)
        mock__check_start.assert_called_once_with(function=func)

        mock__check_start.reset_mock()

        self.task_pool._task_groups.clear()
+        self.task_pool._before_gathering = []

-        self.assertIsNone(self.task_pool._map(group_name, n, func, arg_iter, stars, end_cb, cancel_cb))
+        self.assertIsNone(await self.task_pool._map(group_name, group_size, func, arg_iter, stars, end_cb, cancel_cb))
        mock__check_start.assert_called_once_with(function=func)
        mock_reg_cls.assert_called_once_with()
        self.task_pool._task_groups[group_name] = mock_group_reg
-        mock__arg_consumer.assert_called_once_with(group_name, n, func, arg_iter, stars,
-                                                   end_callback=end_cb, cancel_callback=cancel_cb)
-        mock_create_task.assert_called_once_with(fake_consumer)
-        self.assertSetEqual({fake_task}, self.task_pool._group_meta_tasks_running[group_name])
+        mock_group_reg.__aenter__.assert_awaited_once_with()
+        mock_queue_cls.assert_called_once_with(maxsize=group_size)
+        mock_join_queue.assert_called_once_with(mock_q)
+        self.assertListEqual([fake_join], self.task_pool._before_gathering)
+        mock__queue_producer.assert_called_once()
+        mock__queue_consumer.assert_called_once_with(mock_q, group_name, func, stars, end_cb, cancel_cb)
+        mock_create_task.assert_has_calls([call(fake_producer), call(fake_consumer)])
+        self.assertSetEqual({fake_task1, fake_task2}, self.task_pool._group_meta_tasks_running[group_name])
+        mock_group_reg.__aexit__.assert_awaited_once()

    @patch.object(pool.TaskPool, '_map')
    @patch.object(pool.TaskPool, '_generate_group_name')
-    def test_map(self, mock__generate_group_name: MagicMock, mock__map: MagicMock):
+    async def test_map(self, mock__generate_group_name: MagicMock, mock__map: AsyncMock):
        mock__generate_group_name.return_value = generated_name = 'name 1 2 3'
        mock_func = MagicMock()
-        arg_iter, num_concurrent, group_name = (FOO, BAR, 1, 2, 3), 2, FOO + BAR
+        arg_iter, group_size, group_name = (FOO, BAR, 1, 2, 3), 2, FOO + BAR
        end_cb, cancel_cb = MagicMock(), MagicMock()
-        output = self.task_pool.map(mock_func, arg_iter, num_concurrent, group_name, end_cb, cancel_cb)
+        output = await self.task_pool.map(mock_func, arg_iter, group_size, group_name, end_cb, cancel_cb)
        self.assertEqual(group_name, output)
-        mock__map.assert_called_once_with(group_name, num_concurrent, mock_func, arg_iter, 0,
+        mock__map.assert_awaited_once_with(group_name, group_size, mock_func, arg_iter, 0,
                                           end_callback=end_cb, cancel_callback=cancel_cb)
        mock__generate_group_name.assert_not_called()

        mock__map.reset_mock()
-        output = self.task_pool.map(mock_func, arg_iter, num_concurrent, None, end_cb, cancel_cb)
+        output = await self.task_pool.map(mock_func, arg_iter, group_size, None, end_cb, cancel_cb)
        self.assertEqual(generated_name, output)
-        mock__map.assert_called_once_with(generated_name, num_concurrent, mock_func, arg_iter, 0,
+        mock__map.assert_awaited_once_with(generated_name, group_size, mock_func, arg_iter, 0,
                                           end_callback=end_cb, cancel_callback=cancel_cb)
        mock__generate_group_name.assert_called_once_with('map', mock_func)

    @patch.object(pool.TaskPool, '_map')
    @patch.object(pool.TaskPool, '_generate_group_name')
-    def test_starmap(self, mock__generate_group_name: MagicMock, mock__map: MagicMock):
+    async def test_starmap(self, mock__generate_group_name: MagicMock, mock__map: AsyncMock):
        mock__generate_group_name.return_value = generated_name = 'name 1 2 3'
        mock_func = MagicMock()
-        args_iter, num_concurrent, group_name = ([FOO], [BAR]), 2, FOO + BAR
+        args_iter, group_size, group_name = ([FOO], [BAR]), 2, FOO + BAR
        end_cb, cancel_cb = MagicMock(), MagicMock()
-        output = self.task_pool.starmap(mock_func, args_iter, num_concurrent, group_name, end_cb, cancel_cb)
+        output = await self.task_pool.starmap(mock_func, args_iter, group_size, group_name, end_cb, cancel_cb)
        self.assertEqual(group_name, output)
-        mock__map.assert_called_once_with(group_name, num_concurrent, mock_func, args_iter, 1,
+        mock__map.assert_awaited_once_with(group_name, group_size, mock_func, args_iter, 1,
                                           end_callback=end_cb, cancel_callback=cancel_cb)
        mock__generate_group_name.assert_not_called()

        mock__map.reset_mock()
-        output = self.task_pool.starmap(mock_func, args_iter, num_concurrent, None, end_cb, cancel_cb)
+        output = await self.task_pool.starmap(mock_func, args_iter, group_size, None, end_cb, cancel_cb)
        self.assertEqual(generated_name, output)
-        mock__map.assert_called_once_with(generated_name, num_concurrent, mock_func, args_iter, 1,
+        mock__map.assert_awaited_once_with(generated_name, group_size, mock_func, args_iter, 1,
                                           end_callback=end_cb, cancel_callback=cancel_cb)
        mock__generate_group_name.assert_called_once_with('starmap', mock_func)

    @patch.object(pool.TaskPool, '_map')
    @patch.object(pool.TaskPool, '_generate_group_name')
-    async def test_doublestarmap(self, mock__generate_group_name: MagicMock, mock__map: MagicMock):
+    async def test_doublestarmap(self, mock__generate_group_name: MagicMock, mock__map: AsyncMock):
        mock__generate_group_name.return_value = generated_name = 'name 1 2 3'
        mock_func = MagicMock()
-        kw_iter, num_concurrent, group_name = [{'a': FOO}, {'a': BAR}], 2, FOO + BAR
+        kwargs_iter, group_size, group_name = [{'a': FOO}, {'a': BAR}], 2, FOO + BAR
        end_cb, cancel_cb = MagicMock(), MagicMock()
-        output = self.task_pool.doublestarmap(mock_func, kw_iter, num_concurrent, group_name, end_cb, cancel_cb)
+        output = await self.task_pool.doublestarmap(mock_func, kwargs_iter, group_size, group_name, end_cb, cancel_cb)
        self.assertEqual(group_name, output)
-        mock__map.assert_called_once_with(group_name, num_concurrent, mock_func, kw_iter, 2,
+        mock__map.assert_awaited_once_with(group_name, group_size, mock_func, kwargs_iter, 2,
                                           end_callback=end_cb, cancel_callback=cancel_cb)
        mock__generate_group_name.assert_not_called()

        mock__map.reset_mock()
-        output = self.task_pool.doublestarmap(mock_func, kw_iter, num_concurrent, None, end_cb, cancel_cb)
+        output = await self.task_pool.doublestarmap(mock_func, kwargs_iter, group_size, None, end_cb, cancel_cb)
        self.assertEqual(generated_name, output)
-        mock__map.assert_called_once_with(generated_name, num_concurrent, mock_func, kw_iter, 2,
+        mock__map.assert_awaited_once_with(generated_name, group_size, mock_func, kwargs_iter, 2,
                                           end_callback=end_cb, cancel_callback=cancel_cb)
        mock__generate_group_name.assert_called_once_with('doublestarmap', mock_func)

@ -762,15 +753,13 @@ class SimpleTaskPoolTestCase(CommonTestCase):
    TEST_POOL_CANCEL_CB = MagicMock()

    def get_task_pool_init_params(self) -> dict:
-        params = super().get_task_pool_init_params()
-        params.update({
+        return super().get_task_pool_init_params() | {
            'func': self.TEST_POOL_FUNC,
            'args': self.TEST_POOL_ARGS,
            'kwargs': self.TEST_POOL_KWARGS,
            'end_callback': self.TEST_POOL_END_CB,
            'cancel_callback': self.TEST_POOL_CANCEL_CB,
-        })
-        return params
+        }

    def setUp(self) -> None:
        self.base_class_init_patcher = patch.object(pool.BaseTaskPool, '__init__')
@ -779,7 +768,6 @@ class SimpleTaskPoolTestCase(CommonTestCase):

    def tearDown(self) -> None:
        self.base_class_init_patcher.stop()
-        super().tearDown()

    def test_init(self):
        self.assertEqual(self.TEST_POOL_FUNC, self.task_pool._func)
@ -796,54 +784,23 @@ class SimpleTaskPoolTestCase(CommonTestCase):
        self.assertEqual(self.TEST_POOL_FUNC.__name__, self.task_pool.func_name)

    @patch.object(pool.SimpleTaskPool, '_start_task')
-    async def test__start_num(self, mock__start_task: AsyncMock):
-        group_name = FOO + BAR + 'abc'
-        mock_awaitable1, mock_awaitable2 = object(), object()
-        self.task_pool._func = MagicMock(side_effect=[mock_awaitable1, Exception(), mock_awaitable2], __name__='func')
-        num = 3
-        self.assertIsNone(await self.task_pool._start_num(num, group_name))
-        self.task_pool._func.assert_has_calls(num * [call(*self.task_pool._args, **self.task_pool._kwargs)])
-        call_kw = {
-            'group_name': group_name,
-            'end_callback': self.task_pool._end_callback,
-            'cancel_callback': self.task_pool._cancel_callback
-        }
-        mock__start_task.assert_has_awaits([call(mock_awaitable1, **call_kw), call(mock_awaitable2, **call_kw)])
+    async def test__start_one(self, mock__start_task: AsyncMock):
+        mock__start_task.return_value = expected_output = 99
+        self.task_pool._func = MagicMock(return_value=BAR)
+        output = await self.task_pool._start_one()
+        self.assertEqual(expected_output, output)
+        self.task_pool._func.assert_called_once_with(*self.task_pool._args, **self.task_pool._kwargs)
+        mock__start_task.assert_awaited_once_with(BAR, end_callback=self.task_pool._end_callback,
+                                                  cancel_callback=self.task_pool._cancel_callback)

-        self.task_pool._func.reset_mock(side_effect=True)
-        mock__start_task.reset_mock()
-
-        # Simulate cancellation while the second task is being started.
-        mock__start_task.side_effect = [None, CancelledError, None]
-        mock_coroutine_to_close = MagicMock()
-        self.task_pool._func.side_effect = [mock_awaitable1, mock_coroutine_to_close, 'never called']
-        self.assertIsNone(await self.task_pool._start_num(num, group_name))
-        self.task_pool._func.assert_has_calls(2 * [call(*self.task_pool._args, **self.task_pool._kwargs)])
-        mock__start_task.assert_has_awaits([call(mock_awaitable1, **call_kw), call(mock_coroutine_to_close, **call_kw)])
-        mock_coroutine_to_close.close.assert_called_once_with()
-
-    @patch.object(pool, 'create_task')
-    @patch.object(pool.SimpleTaskPool, '_start_num', new_callable=MagicMock())
-    @patch.object(pool, 'TaskGroupRegister')
-    @patch.object(pool.BaseTaskPool, '_check_start')
-    def test_start(self, mock__check_start: MagicMock, mock_reg_cls: MagicMock, mock__start_num: AsyncMock,
-                   mock_create_task: MagicMock):
-        mock_group_reg = set_up_mock_group_register(mock_reg_cls)
-        mock__start_num.return_value = mock_start_num_coroutine = object()
-        mock_create_task.return_value = fake_task = object()
-        self.task_pool._task_groups = {}
-        self.task_pool._group_meta_tasks_running = {}
+    @patch.object(pool.SimpleTaskPool, '_start_one')
+    async def test_start(self, mock__start_one: AsyncMock):
+        mock__start_one.return_value = FOO
        num = 5
-        self.task_pool._start_calls = 42
-        expected_group_name = 'start-group-42'
-        output = self.task_pool.start(num)
-        self.assertEqual(expected_group_name, output)
-        mock__check_start.assert_called_once_with(function=self.TEST_POOL_FUNC)
-        self.assertEqual(43, self.task_pool._start_calls)
-        self.assertEqual(mock_group_reg, self.task_pool._task_groups[expected_group_name])
-        mock__start_num.assert_called_once_with(num, expected_group_name)
-        mock_create_task.assert_called_once_with(mock_start_num_coroutine)
-        self.assertSetEqual({fake_task}, self.task_pool._group_meta_tasks_running[expected_group_name])
+        output = await self.task_pool.start(num)
+        expected_output = num * [FOO]
+        self.assertListEqual(expected_output, output)
+        mock__start_one.assert_has_awaits(num * [call()])

    @patch.object(pool.SimpleTaskPool, 'cancel')
    def test_stop(self, mock_cancel: MagicMock):
--- a/tests/test_queue_context.py
+++ b/tests/test_queue_context.py
@ -1,43 +0,0 @@
-__author__ = "Daniil Fajnberg"
-__copyright__ = "Copyright © 2022 Daniil Fajnberg"
-__license__ = """GNU LGPLv3.0
-
-This file is part of asyncio-taskpool.
-
-asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
-version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
-
-asyncio-taskpool 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 Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
-If not, see <https://www.gnu.org/licenses/>."""
-
-__doc__ = """
-Unittests for the `asyncio_taskpool.queue_context` module.
-"""
-
-
-from unittest import IsolatedAsyncioTestCase
-from unittest.mock import MagicMock, patch
-
-from asyncio_taskpool.queue_context import Queue
-
-
-class QueueTestCase(IsolatedAsyncioTestCase):
-    def test_item_processed(self):
-        queue = Queue()
-        queue._unfinished_tasks = 1000
-        queue.item_processed()
-        self.assertEqual(999, queue._unfinished_tasks)
-
-    @patch.object(Queue, 'item_processed')
-    async def test_contextmanager(self, mock_item_processed: MagicMock):
-        queue = Queue()
-        item = 'foo'
-        queue.put_nowait(item)
-        async with queue as item_from_queue:
-            self.assertEqual(item, item_from_queue)
-            mock_item_processed.assert_not_called()
-        mock_item_processed.assert_called_once_with()
--- a/tests/test_control/test_server.py
+++ b/tests/test_control/test_server.py
@ -21,13 +21,12 @@ Unittests for the `asyncio_taskpool.server` module.

 import asyncio
 import logging
-import os
 from pathlib import Path
-from unittest import IsolatedAsyncioTestCase, skipIf
+from unittest import IsolatedAsyncioTestCase
 from unittest.mock import AsyncMock, MagicMock, patch

-from asyncio_taskpool.control import server
-from asyncio_taskpool.control.client import ControlClient, TCPControlClient, UnixControlClient
+from asyncio_taskpool import server
+from asyncio_taskpool.client import ControlClient, UnixControlClient


 FOO, BAR = 'foo', 'bar'
@ -46,7 +45,7 @@ class ControlServerTestCase(IsolatedAsyncioTestCase):
        server.log.setLevel(cls.log_lvl)

    def setUp(self) -> None:
-        self.abstract_patcher = patch('asyncio_taskpool.control.server.ControlServer.__abstractmethods__', set())
+        self.abstract_patcher = patch('asyncio_taskpool.server.ControlServer.__abstractmethods__', set())
        self.mock_abstract_methods = self.abstract_patcher.start()
        self.mock_pool = MagicMock()
        self.kwargs = {FOO: 123, BAR: 456}
@ -120,51 +119,6 @@ class ControlServerTestCase(IsolatedAsyncioTestCase):
        mock_create_task.assert_called_once_with(mock_awaitable)


-class TCPControlServerTestCase(IsolatedAsyncioTestCase):
-    log_lvl: int
-
-    @classmethod
-    def setUpClass(cls) -> None:
-        cls.log_lvl = server.log.level
-        server.log.setLevel(999)
-
-    @classmethod
-    def tearDownClass(cls) -> None:
-        server.log.setLevel(cls.log_lvl)
-
-    def setUp(self) -> None:
-        self.base_init_patcher = patch.object(server.ControlServer, '__init__')
-        self.mock_base_init = self.base_init_patcher.start()
-        self.mock_pool = MagicMock()
-        self.host, self.port = 'localhost', 12345
-        self.kwargs = {FOO: 123, BAR: 456}
-        self.server = server.TCPControlServer(pool=self.mock_pool, host=self.host, port=self.port, **self.kwargs)
-
-    def tearDown(self) -> None:
-        self.base_init_patcher.stop()
-
-    def test__client_class(self):
-        self.assertEqual(TCPControlClient, self.server._client_class)
-
-    def test_init(self):
-        self.assertEqual(self.host, self.server._host)
-        self.assertEqual(self.port, self.server._port)
-        self.mock_base_init.assert_called_once_with(self.mock_pool, **self.kwargs)
-
-    @patch.object(server, 'start_server')
-    async def test__get_server_instance(self, mock_start_server: AsyncMock):
-        mock_start_server.return_value = expected_output = 'totally_a_server'
-        mock_callback, mock_kwargs = MagicMock(), {'a': 1, 'b': 2}
-        args = [mock_callback]
-        output = await self.server._get_server_instance(*args, **mock_kwargs)
-        self.assertEqual(expected_output, output)
-        mock_start_server.assert_called_once_with(mock_callback, self.host, self.port, **mock_kwargs)
-
-    def test__final_callback(self):
-        self.assertIsNone(self.server._final_callback())
-
-
-@skipIf(os.name == 'nt', "No Unix sockets on Windows :(")
 class UnixControlServerTestCase(IsolatedAsyncioTestCase):
    log_lvl: int

@ -183,7 +137,7 @@ class UnixControlServerTestCase(IsolatedAsyncioTestCase):
        self.mock_pool = MagicMock()
        self.path = '/tmp/asyncio_taskpool'
        self.kwargs = {FOO: 123, BAR: 456}
-        self.server = server.UnixControlServer(pool=self.mock_pool, socket_path=self.path, **self.kwargs)
+        self.server = server.UnixControlServer(pool=self.mock_pool, path=self.path, **self.kwargs)

    def tearDown(self) -> None:
        self.base_init_patcher.stop()
@ -195,9 +149,9 @@ class UnixControlServerTestCase(IsolatedAsyncioTestCase):
        self.assertEqual(Path(self.path), self.server._socket_path)
        self.mock_base_init.assert_called_once_with(self.mock_pool, **self.kwargs)

-    async def test__get_server_instance(self):
-        expected_output = 'totally_a_server'
-        self.server._start_unix_server = mock_start_unix_server = AsyncMock(return_value=expected_output)
+    @patch.object(server, 'start_unix_server')
+    async def test__get_server_instance(self, mock_start_unix_server: AsyncMock):
+        mock_start_unix_server.return_value = expected_output = 'totally_a_server'
        mock_callback, mock_kwargs = MagicMock(), {'a': 1, 'b': 2}
        args = [mock_callback]
        output = await self.server._get_server_instance(*args, **mock_kwargs)
--- a/tests/test_session.py
+++ b/tests/test_session.py
@ -0,0 +1,324 @@
+__author__ = "Daniil Fajnberg"
+__copyright__ = "Copyright © 2022 Daniil Fajnberg"
+__license__ = """GNU LGPLv3.0
+
+This file is part of asyncio-taskpool.
+
+asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
+version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
+
+asyncio-taskpool 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
+If not, see <https://www.gnu.org/licenses/>."""
+
+__doc__ = """
+Unittests for the `asyncio_taskpool.session` module.
+"""
+
+
+import json
+from argparse import ArgumentError, Namespace
+from unittest import IsolatedAsyncioTestCase
+from unittest.mock import AsyncMock, MagicMock, patch, call
+
+from asyncio_taskpool import session
+from asyncio_taskpool.constants import CLIENT_INFO, CMD, SESSION_MSG_BYTES, SESSION_WRITER
+from asyncio_taskpool.exceptions import HelpRequested, NotATaskPool, UnknownTaskPoolClass
+from asyncio_taskpool.pool import BaseTaskPool, TaskPool, SimpleTaskPool
+
+
+FOO, BAR = 'foo', 'bar'
+
+
+class ControlServerTestCase(IsolatedAsyncioTestCase):
+    log_lvl: int
+
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls.log_lvl = session.log.level
+        session.log.setLevel(999)
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        session.log.setLevel(cls.log_lvl)
+
+    def setUp(self) -> None:
+        self.mock_pool = MagicMock(spec=SimpleTaskPool(AsyncMock()))
+        self.mock_client_class_name = FOO + BAR
+        self.mock_server = MagicMock(pool=self.mock_pool,
+                                     client_class_name=self.mock_client_class_name)
+        self.mock_reader = MagicMock()
+        self.mock_writer = MagicMock()
+        self.session = session.ControlSession(self.mock_server, self.mock_reader, self.mock_writer)
+
+    def test_init(self):
+        self.assertEqual(self.mock_server, self.session._control_server)
+        self.assertEqual(self.mock_pool, self.session._pool)
+        self.assertEqual(self.mock_client_class_name, self.session._client_class_name)
+        self.assertEqual(self.mock_reader, self.session._reader)
+        self.assertEqual(self.mock_writer, self.session._writer)
+        self.assertIsNone(self.session._parser)
+        self.assertIsNone(self.session._subparsers)
+
+    def test__add_command(self):
+        expected_output = 123456
+        mock_add_parser = MagicMock(return_value=expected_output)
+        self.session._subparsers = MagicMock(add_parser=mock_add_parser)
+        self.session._parser = MagicMock()
+        name, prog, short_help, long_help = 'abc', None, 'short123', None
+        kwargs = {'x': 1, 'y': 2}
+        output = self.session._add_command(name, prog, short_help, long_help, **kwargs)
+        self.assertEqual(expected_output, output)
+        mock_add_parser.assert_called_once_with(name, prog=name, help=short_help, description=short_help,
+                                                parent=self.session._parser, **kwargs)
+
+        mock_add_parser.reset_mock()
+
+        prog, long_help = 'ffffff', 'so long, wow'
+        output = self.session._add_command(name, prog, short_help, long_help, **kwargs)
+        self.assertEqual(expected_output, output)
+        mock_add_parser.assert_called_once_with(name, prog=prog, help=short_help, description=long_help,
+                                                parent=self.session._parser, **kwargs)
+
+        mock_add_parser.reset_mock()
+
+        short_help = None
+        output = self.session._add_command(name, prog, short_help, long_help, **kwargs)
+        self.assertEqual(expected_output, output)
+        mock_add_parser.assert_called_once_with(name, prog=prog, help=long_help, description=long_help,
+                                                parent=self.session._parser, **kwargs)
+
+    @patch.object(session, 'get_first_doc_line')
+    @patch.object(session.ControlSession, '_add_command')
+    def test__adding_commands(self, mock__add_command: MagicMock, mock_get_first_doc_line: MagicMock):
+        self.assertIsNone(self.session._add_base_commands())
+        mock__add_command.assert_called()
+        mock_get_first_doc_line.assert_called()
+
+        mock__add_command.reset_mock()
+        mock_get_first_doc_line.reset_mock()
+
+        self.assertIsNone(self.session._add_simple_commands())
+        mock__add_command.assert_called()
+        mock_get_first_doc_line.assert_called()
+
+        with self.assertRaises(NotImplementedError):
+            self.session._add_advanced_commands()
+
+    @patch.object(session.ControlSession, '_add_simple_commands')
+    @patch.object(session.ControlSession, '_add_advanced_commands')
+    @patch.object(session.ControlSession, '_add_base_commands')
+    @patch.object(session, 'CommandParser')
+    def test__init_parser(self, mock_command_parser_cls: MagicMock, mock__add_base_commands: MagicMock,
+                          mock__add_advanced_commands: MagicMock, mock__add_simple_commands: MagicMock):
+        mock_command_parser_cls.return_value = mock_parser = MagicMock()
+        self.session._pool = TaskPool()
+        width = 1234
+        expected_parser_kwargs = {
+            'prog': '',
+            SESSION_WRITER: self.mock_writer,
+            CLIENT_INFO.TERMINAL_WIDTH: width,
+        }
+        self.assertIsNone(self.session._init_parser(width))
+        mock_command_parser_cls.assert_called_once_with(**expected_parser_kwargs)
+        mock_parser.add_subparsers.assert_called_once_with(title="Commands", dest=CMD.CMD)
+        mock__add_base_commands.assert_called_once_with()
+        mock__add_advanced_commands.assert_called_once_with()
+        mock__add_simple_commands.assert_not_called()
+
+        mock_command_parser_cls.reset_mock()
+        mock_parser.add_subparsers.reset_mock()
+        mock__add_base_commands.reset_mock()
+        mock__add_advanced_commands.reset_mock()
+        mock__add_simple_commands.reset_mock()
+
+        async def fake_coroutine(): pass
+
+        self.session._pool = SimpleTaskPool(fake_coroutine)
+        self.assertIsNone(self.session._init_parser(width))
+        mock_command_parser_cls.assert_called_once_with(**expected_parser_kwargs)
+        mock_parser.add_subparsers.assert_called_once_with(title="Commands", dest=CMD.CMD)
+        mock__add_base_commands.assert_called_once_with()
+        mock__add_advanced_commands.assert_not_called()
+        mock__add_simple_commands.assert_called_once_with()
+
+        mock_command_parser_cls.reset_mock()
+        mock_parser.add_subparsers.reset_mock()
+        mock__add_base_commands.reset_mock()
+        mock__add_advanced_commands.reset_mock()
+        mock__add_simple_commands.reset_mock()
+
+        class FakeTaskPool(BaseTaskPool):
+            pass
+
+        self.session._pool = FakeTaskPool()
+        with self.assertRaises(UnknownTaskPoolClass):
+            self.session._init_parser(width)
+        mock_command_parser_cls.assert_called_once_with(**expected_parser_kwargs)
+        mock_parser.add_subparsers.assert_called_once_with(title="Commands", dest=CMD.CMD)
+        mock__add_base_commands.assert_called_once_with()
+        mock__add_advanced_commands.assert_not_called()
+        mock__add_simple_commands.assert_not_called()
+
+        mock_command_parser_cls.reset_mock()
+        mock_parser.add_subparsers.reset_mock()
+        mock__add_base_commands.reset_mock()
+        mock__add_advanced_commands.reset_mock()
+        mock__add_simple_commands.reset_mock()
+
+        self.session._pool = MagicMock()
+        with self.assertRaises(NotATaskPool):
+            self.session._init_parser(width)
+        mock_command_parser_cls.assert_called_once_with(**expected_parser_kwargs)
+        mock_parser.add_subparsers.assert_called_once_with(title="Commands", dest=CMD.CMD)
+        mock__add_base_commands.assert_called_once_with()
+        mock__add_advanced_commands.assert_not_called()
+        mock__add_simple_commands.assert_not_called()
+
+    @patch.object(session.ControlSession, '_init_parser')
+    async def test_client_handshake(self, mock__init_parser: MagicMock):
+        width = 5678
+        msg = ' ' + json.dumps({CLIENT_INFO.TERMINAL_WIDTH: width, FOO: BAR}) + '  '
+        mock_read = AsyncMock(return_value=msg.encode())
+        self.mock_reader.read = mock_read
+        self.mock_writer.drain = AsyncMock()
+        self.assertIsNone(await self.session.client_handshake())
+        mock_read.assert_awaited_once_with(SESSION_MSG_BYTES)
+        mock__init_parser.assert_called_once_with(width)
+        self.mock_writer.write.assert_called_once_with(str(self.mock_pool).encode())
+        self.mock_writer.drain.assert_awaited_once_with()
+
+    @patch.object(session, 'return_or_exception')
+    async def test__write_function_output(self, mock_return_or_exception: MagicMock):
+        self.mock_writer.write = MagicMock()
+        mock_return_or_exception.return_value = None
+        func, args, kwargs = MagicMock(), (1, 2, 3), {'a': 'A', 'b': 'B'}
+        self.assertIsNone(await self.session._write_function_output(func, *args, **kwargs))
+        mock_return_or_exception.assert_called_once_with(func, *args, **kwargs)
+        self.mock_writer.write.assert_called_once_with(b"ok")
+
+        mock_return_or_exception.reset_mock()
+        self.mock_writer.write.reset_mock()
+
+        mock_return_or_exception.return_value = output = MagicMock()
+        self.assertIsNone(await self.session._write_function_output(func, *args, **kwargs))
+        mock_return_or_exception.assert_called_once_with(func, *args, **kwargs)
+        self.mock_writer.write.assert_called_once_with(str(output).encode())
+
+    @patch.object(session.ControlSession, '_write_function_output')
+    async def test__cmd_name(self, mock__write_function_output: AsyncMock):
+        self.assertIsNone(await self.session._cmd_name())
+        mock__write_function_output.assert_awaited_once_with(self.mock_pool.__class__.__str__, self.session._pool)
+
+    @patch.object(session.ControlSession, '_write_function_output')
+    async def test__cmd_pool_size(self, mock__write_function_output: AsyncMock):
+        num = 12345
+        kwargs = {session.NUM: num, FOO: BAR}
+        self.assertIsNone(await self.session._cmd_pool_size(**kwargs))
+        mock__write_function_output.assert_awaited_once_with(
+            self.mock_pool.__class__.pool_size.fset, self.session._pool, num
+        )
+
+        mock__write_function_output.reset_mock()
+
+        kwargs.pop(session.NUM)
+        self.assertIsNone(await self.session._cmd_pool_size(**kwargs))
+        mock__write_function_output.assert_awaited_once_with(
+            self.mock_pool.__class__.pool_size.fget, self.session._pool
+        )
+
+    @patch.object(session.ControlSession, '_write_function_output')
+    async def test__cmd_num_running(self, mock__write_function_output: AsyncMock):
+        self.assertIsNone(await self.session._cmd_num_running())
+        mock__write_function_output.assert_awaited_once_with(
+            self.mock_pool.__class__.num_running.fget, self.session._pool
+        )
+
+    @patch.object(session.ControlSession, '_write_function_output')
+    async def test__cmd_start(self, mock__write_function_output: AsyncMock):
+        num = 12345
+        kwargs = {session.NUM: num, FOO: BAR}
+        self.assertIsNone(await self.session._cmd_start(**kwargs))
+        mock__write_function_output.assert_awaited_once_with(self.mock_pool.start, num)
+
+    @patch.object(session.ControlSession, '_write_function_output')
+    async def test__cmd_stop(self, mock__write_function_output: AsyncMock):
+        num = 12345
+        kwargs = {session.NUM: num, FOO: BAR}
+        self.assertIsNone(await self.session._cmd_stop(**kwargs))
+        mock__write_function_output.assert_awaited_once_with(self.mock_pool.stop, num)
+
+    @patch.object(session.ControlSession, '_write_function_output')
+    async def test__cmd_stop_all(self, mock__write_function_output: AsyncMock):
+        self.assertIsNone(await self.session._cmd_stop_all())
+        mock__write_function_output.assert_awaited_once_with(self.mock_pool.stop_all)
+
+    @patch.object(session.ControlSession, '_write_function_output')
+    async def test__cmd_func_name(self, mock__write_function_output: AsyncMock):
+        self.assertIsNone(await self.session._cmd_func_name())
+        mock__write_function_output.assert_awaited_once_with(
+            self.mock_pool.__class__.func_name.fget, self.session._pool
+        )
+
+    async def test__execute_command(self):
+        mock_method = AsyncMock()
+        cmd = 'this-is-a-test'
+        setattr(self.session, '_cmd_' + cmd.replace('-', '_'), mock_method)
+        kwargs = {FOO: BAR, 'hello': 'python'}
+        self.assertIsNone(await self.session._execute_command(**{CMD.CMD: cmd}, **kwargs))
+        mock_method.assert_awaited_once_with(**kwargs)
+
+    @patch.object(session.ControlSession, '_execute_command')
+    async def test__parse_command(self, mock__execute_command: AsyncMock):
+        msg = 'asdf asd as a'
+        kwargs = {FOO: BAR, 'hello': 'python'}
+        mock_parse_args = MagicMock(return_value=Namespace(**kwargs))
+        self.session._parser = MagicMock(parse_args=mock_parse_args)
+        self.mock_writer.write = MagicMock()
+        self.assertIsNone(await self.session._parse_command(msg))
+        mock_parse_args.assert_called_once_with(msg.split(' '))
+        self.mock_writer.write.assert_not_called()
+        mock__execute_command.assert_awaited_once_with(**kwargs)
+
+        mock__execute_command.reset_mock()
+        mock_parse_args.reset_mock()
+
+        mock_parse_args.side_effect = exc = ArgumentError(MagicMock(), "oops")
+        self.assertIsNone(await self.session._parse_command(msg))
+        mock_parse_args.assert_called_once_with(msg.split(' '))
+        self.mock_writer.write.assert_called_once_with(str(exc).encode())
+        mock__execute_command.assert_not_awaited()
+
+        self.mock_writer.write.reset_mock()
+        mock_parse_args.reset_mock()
+
+        mock_parse_args.side_effect = HelpRequested()
+        self.assertIsNone(await self.session._parse_command(msg))
+        mock_parse_args.assert_called_once_with(msg.split(' '))
+        self.mock_writer.write.assert_not_called()
+        mock__execute_command.assert_not_awaited()
+
+    @patch.object(session.ControlSession, '_parse_command')
+    async def test_listen(self, mock__parse_command: AsyncMock):
+        def make_reader_return_empty():
+            self.mock_reader.read.return_value = b''
+        self.mock_writer.drain = AsyncMock(side_effect=make_reader_return_empty)
+        msg = "fascinating"
+        self.mock_reader.read = AsyncMock(return_value=f' {msg} '.encode())
+        self.assertIsNone(await self.session.listen())
+        self.mock_reader.read.assert_has_awaits([call(SESSION_MSG_BYTES), call(SESSION_MSG_BYTES)])
+        mock__parse_command.assert_awaited_once_with(msg)
+        self.mock_writer.drain.assert_awaited_once_with()
+
+        self.mock_reader.read.reset_mock()
+        mock__parse_command.reset_mock()
+        self.mock_writer.drain.reset_mock()
+
+        self.mock_server.is_serving = MagicMock(return_value=False)
+        self.assertIsNone(await self.session.listen())
+        self.mock_reader.read.assert_not_awaited()
+        mock__parse_command.assert_not_awaited()
+        self.mock_writer.drain.assert_not_awaited()
--- a/tests/test_session_parser.py
+++ b/tests/test_session_parser.py
@ -0,0 +1,134 @@
+__author__ = "Daniil Fajnberg"
+__copyright__ = "Copyright © 2022 Daniil Fajnberg"
+__license__ = """GNU LGPLv3.0
+
+This file is part of asyncio-taskpool.
+
+asyncio-taskpool is free software: you can redistribute it and/or modify it under the terms of
+version 3.0 of the GNU Lesser General Public License as published by the Free Software Foundation.
+
+asyncio-taskpool 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 Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along with asyncio-taskpool. 
+If not, see <https://www.gnu.org/licenses/>."""
+
+__doc__ = """
+Unittests for the `asyncio_taskpool.session_parser` module.
+"""
+
+
+from argparse import Action, ArgumentParser, HelpFormatter, ArgumentDefaultsHelpFormatter, RawTextHelpFormatter
+from unittest import IsolatedAsyncioTestCase
+from unittest.mock import MagicMock, patch
+
+from asyncio_taskpool import session_parser
+from asyncio_taskpool.constants import SESSION_WRITER, CLIENT_INFO
+from asyncio_taskpool.exceptions import HelpRequested
+
+
+FOO = 'foo'
+
+
+class ControlServerTestCase(IsolatedAsyncioTestCase):
+
+    def setUp(self) -> None:
+        self.help_formatter_factory_patcher = patch.object(session_parser.CommandParser, 'help_formatter_factory')
+        self.mock_help_formatter_factory = self.help_formatter_factory_patcher.start()
+        self.mock_help_formatter_factory.return_value = RawTextHelpFormatter
+        self.session_writer, self.terminal_width = MagicMock(), 420
+        self.kwargs = {
+            SESSION_WRITER: self.session_writer,
+            CLIENT_INFO.TERMINAL_WIDTH: self.terminal_width,
+            session_parser.FORMATTER_CLASS: FOO
+        }
+        self.parser = session_parser.CommandParser(**self.kwargs)
+
+    def tearDown(self) -> None:
+        self.help_formatter_factory_patcher.stop()
+
+    def test_help_formatter_factory(self):
+        self.help_formatter_factory_patcher.stop()
+
+        class MockBaseClass(HelpFormatter):
+            def __init__(self, *args, **kwargs):
+                super().__init__(*args, **kwargs)
+
+        terminal_width = 123456789
+        cls = session_parser.CommandParser.help_formatter_factory(terminal_width, MockBaseClass)
+        self.assertTrue(issubclass(cls, MockBaseClass))
+        instance = cls('prog')
+        self.assertEqual(terminal_width, getattr(instance, '_width'))
+
+        cls = session_parser.CommandParser.help_formatter_factory(terminal_width)
+        self.assertTrue(issubclass(cls, ArgumentDefaultsHelpFormatter))
+        instance = cls('prog')
+        self.assertEqual(terminal_width, getattr(instance, '_width'))
+
+    def test_init(self):
+        self.assertIsInstance(self.parser, ArgumentParser)
+        self.assertEqual(self.session_writer, self.parser._session_writer)
+        self.assertEqual(self.terminal_width, self.parser._terminal_width)
+        self.mock_help_formatter_factory.assert_called_once_with(self.terminal_width, FOO)
+        self.assertFalse(getattr(self.parser, 'exit_on_error'))
+        self.assertEqual(RawTextHelpFormatter, getattr(self.parser, 'formatter_class'))
+
+    def test_session_writer(self):
+        self.assertEqual(self.session_writer, self.parser.session_writer)
+
+    def test_terminal_width(self):
+        self.assertEqual(self.terminal_width, self.parser.terminal_width)
+
+    def test__print_message(self):
+        self.session_writer.write = MagicMock()
+        self.assertIsNone(self.parser._print_message(''))
+        self.session_writer.write.assert_not_called()
+        msg = 'foo bar baz'
+        self.assertIsNone(self.parser._print_message(msg))
+        self.session_writer.write.assert_called_once_with(msg.encode())
+
+    @patch.object(session_parser.CommandParser, '_print_message')
+    def test_exit(self, mock__print_message: MagicMock):
+        self.assertIsNone(self.parser.exit(123, ''))
+        mock__print_message.assert_not_called()
+        msg = 'foo bar baz'
+        self.assertIsNone(self.parser.exit(123, msg))
+        mock__print_message.assert_called_once_with(msg)
+
+    @patch.object(session_parser.ArgumentParser, 'print_help')
+    def test_print_help(self, mock_print_help: MagicMock):
+        arg = MagicMock()
+        with self.assertRaises(HelpRequested):
+            self.parser.print_help(arg)
+        mock_print_help.assert_called_once_with(arg)
+
+    def test_add_optional_num_argument(self):
+        metavar = 'FOOBAR'
+        action = self.parser.add_optional_num_argument(metavar=metavar)
+        self.assertIsInstance(action, Action)
+        self.assertEqual('?', action.nargs)
+        self.assertEqual(1, action.default)
+        self.assertEqual(int, action.type)
+        self.assertEqual(metavar, action.metavar)
+        num = 111
+        kwargs = vars(self.parser.parse_args([f'{num}']))
+        self.assertDictEqual({session_parser.NUM: num}, kwargs)
+
+        name = f'--{FOO}'
+        nargs = '+'
+        default = 1
+        _type = float
+        required = True
+        dest = 'foo_bar'
+        action = self.parser.add_optional_num_argument(name, nargs=nargs, default=default, type=_type,
+                                                       required=required, metavar=metavar, dest=dest)
+        self.assertIsInstance(action, Action)
+        self.assertEqual(nargs, action.nargs)
+        self.assertEqual(default, action.default)
+        self.assertEqual(_type, action.type)
+        self.assertEqual(required, action.required)
+        self.assertEqual(metavar, action.metavar)
+        self.assertEqual(dest, action.dest)
+        kwargs = vars(self.parser.parse_args([f'{num}', name, '1', '1.5']))
+        self.assertDictEqual({session_parser.NUM: num, dest: [1.0, 1.5]}, kwargs)
--- a/usage/USAGE.md
+++ b/usage/USAGE.md
@ -1,18 +1,12 @@
 # Using `asyncio-taskpool`

-## Contents
- [Contents](#contents)
- [Minimal example for `SimpleTaskPool`](#minimal-example-for-simpletaskpool)
- [Advanced example for `TaskPool`](#advanced-example-for-taskpool)
- [Control server example](#control-server-example)
-
 ## Minimal example for `SimpleTaskPool`

-With a `SimpleTaskPool` the function to execute as well as the arguments with which to execute it must be defined during its initialization (and they cannot be changed later). The only control you have after initialization is how many of such tasks are being run.
-
 The minimum required setup is a "worker" coroutine function that can do something asynchronously, and a main coroutine function that sets up the `SimpleTaskPool`, starts/stops the tasks as desired, and eventually awaits them all. 

-The following demo script enables full log output first for additional clarity. It is complete and should work as is.
+The following demo code enables full log output first for additional clarity. It is complete and should work as is.
+
+### Code

 ```python
 import logging
@ -38,12 +32,13 @@ async def work(n: int) -> None:


 async def main() -> None:
-    pool = SimpleTaskPool(work, args=(5,))  # initializes the pool; no work is being done yet
-    pool.start(3)  # launches work tasks 0, 1, and 2
+    pool = SimpleTaskPool(work, (5,))  # initializes the pool; no work is being done yet
+    await pool.start(3)  # launches work tasks 0, 1, and 2
    await asyncio.sleep(1.5)  # lets the tasks work for a bit
-    pool.start(1)  # launches work task 3
+    await pool.start()  # launches work task 3
    await asyncio.sleep(1.5)  # lets the tasks work for a bit
-    pool.stop(2)  # cancels tasks 3 and 2 (LIFO order)
+    pool.stop(2)  # cancels tasks 3 and 2
+    pool.lock()  # required for the last line
    await pool.gather_and_close()  # awaits all tasks, then flushes the pool


@ -51,9 +46,7 @@ if __name__ == '__main__':
    asyncio.run(main())
 ```

-<details>
-<summary>Output: (Click to expand)</summary>
-
+### Output 
 ```
 SimpleTaskPool-0 initialized
 Started SimpleTaskPool-0_Task-0
@ -83,7 +76,6 @@ Ended SimpleTaskPool-0_Task-1
 > did 4
 > did 4
 ```
-</details>

 ## Advanced example for `TaskPool`

@ -91,7 +83,9 @@ This time, we want to start tasks from _different_ coroutine functions **and** w

 As with the simple example, we need "worker" coroutine functions that can do something asynchronously, as well as a main coroutine function that sets up the pool, starts the tasks, and eventually awaits them.

-The following demo script enables full log output first for additional clarity. It is complete and should work as is.
+The following demo code enables full log output first for additional clarity. It is complete and should work as is.
+
+### Code

 ```python
 import logging
@ -120,23 +114,25 @@ async def other_work(a: int, b: int) -> None:
 async def main() -> None:
    # Initialize a new task pool instance and limit its size to 3 tasks.
    pool = TaskPool(3)
-    # Queue up two tasks (IDs 0 and 1) to run concurrently (with the same keyword-arguments).
+    # Queue up two tasks (IDs 0 and 1) to run concurrently (with the same positional arguments).
    print("> Called `apply`")
-    pool.apply(work, kwargs={'start': 100, 'stop': 200, 'step': 10}, num=2)
+    await pool.apply(work, kwargs={'start': 100, 'stop': 200, 'step': 10}, num=2)
    # Let the tasks work for a bit.
    await asyncio.sleep(1.5)
    # Now, let us enqueue four more tasks (which will receive IDs 2, 3, 4, and 5), each created with different 
-    # positional arguments by using `starmap`, but we want no more than two of those to run concurrently.
+    # positional arguments by using `starmap`, but have **no more than two of those** run concurrently.
    # Since we set our pool size to 3, and already have two tasks working within the pool,
    # only the first one of these will start immediately (and receive ID 2).
    # The second one will start (with ID 3), only once there is room in the pool,
    # which -- in this example -- will be the case after ID 2 ends.
    # Once there is room in the pool again, the third and fourth will each start (with IDs 4 and 5)
-    # only once there is room in the pool and no more than one other task of these new ones is running.
+    # **only** once there is room in the pool **and** no more than one other task of these new ones is running.
    args_list = [(0, 10), (10, 20), (20, 30), (30, 40)]
-    pool.starmap(other_work, args_list, num_concurrent=2)
+    await pool.starmap(other_work, args_list, group_size=2)
    print("> Called `starmap`")
-    # We block, until all tasks have ended.
+    # Now we lock the pool, so that we can safely await all our tasks.
+    pool.lock()
+    # Finally, we block, until all tasks have ended.
    print("> Calling `gather_and_close`...")
    await pool.gather_and_close()
    print("> Done.")
@ -146,9 +142,10 @@ if __name__ == '__main__':
    asyncio.run(main())
 ```

-<details>
-<summary>Output: (Click to expand)</summary>
+### Output 
+Additional comments for the output are provided with `<---` next to the output lines.

+(Keep in mind that the logger and `print` asynchronously write to `stdout`.)
 ```
 TaskPool-0 initialized
 Started TaskPool-0_Task-0
@ -196,7 +193,7 @@ Started TaskPool-0_Task-3
 > other_work with 15
 Ended TaskPool-0_Task-0
 Ended TaskPool-0_Task-1    <--- these two end and free up two more slots in the pool
-Started TaskPool-0_Task-4    <--- since `num_concurrent` is set to 2, Task-5 will not start
+Started TaskPool-0_Task-4    <--- since the group size is set to 2, Task-5 will not start
 > work with 190
 > work with 190
 > other_work with 16
@ -230,37 +227,4 @@ Ended TaskPool-0_Task-5
 > Done.
 ```

-(Added comments with `<---` next to the output lines.)
-
-Keep in mind that the logger and `print` asynchronously write to `stdout`, so the order of lines in your output may be slightly different.
-</details>
-
-## Control server example
-
-One of the main features of `asyncio-taskpool` is the ability to control a task pool "from the outside" at runtime.
-
-The [example_server.py](./example_server.py) script launches a couple of worker tasks within a `SimpleTaskPool` instance and then starts a `TCPControlServer` instance for that task pool. The server is configured to locally bind to port `9999` and is stopped automatically after the "work" is done.
-
-To run the script:
-```shell
-python usage/example_server.py
-```
-
-You can then connect to the server via the command line interface:
-```shell
-python -m asyncio_taskpool.control tcp localhost 9999
-```
-
-The CLI starts a `TCPControlClient` that connects to our example server. Once the connection is established, it gives you an input prompt allowing you to issue commands to the task pool:
-```
-Connected to SimpleTaskPool-0
-Type '-h' to get help and usage instructions for all available commands.
-
->
-```
-
-It may be useful to run the server script and the client interface in two separate terminal windows side by side. The server script is configured with a verbose logger and will react to any commands issued by the client with detailed log messages in the terminal.
-
---
-
 © 2022 Daniil Fajnberg
--- a/usage/example_server.py
+++ b/usage/example_server.py
@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along w
 If not, see <https://www.gnu.org/licenses/>."""

 __doc__ = """
-Working example of a TCPControlServer in combination with the SimpleTaskPool.
+Working example of a UnixControlServer in combination with the SimpleTaskPool.
 Use the main CLI client to interface at the socket.
 """

@ -23,9 +23,8 @@ Use the main CLI client to interface at the socket.
 import asyncio
 import logging

-from asyncio_taskpool import SimpleTaskPool
-from asyncio_taskpool.control import TCPControlServer
-from asyncio_taskpool.internals.constants import PACKAGE_NAME
+from asyncio_taskpool import SimpleTaskPool, UnixControlServer
+from asyncio_taskpool.constants import PACKAGE_NAME


 logging.getLogger().setLevel(logging.NOTSET)
@ -35,11 +34,11 @@ logging.getLogger(PACKAGE_NAME).addHandler(logging.StreamHandler())
 async def work(item: int) -> None:
    """The non-blocking sleep simulates something like an I/O operation that can be done asynchronously."""
    await asyncio.sleep(1)
-    print("worked on", item, flush=True)
+    print("worked on", item)


 async def worker(q: asyncio.Queue) -> None:
-    """Simulates doing asynchronous work that takes a bit of time to finish."""
+    """Simulates doing asynchronous work that takes a little bit of time to finish."""
    # We only want the worker to stop, when its task is cancelled; therefore we start an infinite loop.
    while True:
        # We want to block here, until we can get the next item from the queue.
@ -66,17 +65,18 @@ async def main() -> None:
    # We just put some integers into our queue, since all our workers actually do, is print an item and sleep for a bit.
    for item in range(100):
        q.put_nowait(item)
-    pool = SimpleTaskPool(worker, args=(q,))  # initializes the pool
-    pool.start(3)  # launches three worker tasks
-    control_server_task = await TCPControlServer(pool, host='127.0.0.1', port=9999).serve_forever()
+    pool = SimpleTaskPool(worker, (q,))  # initializes the pool
+    await pool.start(3)  # launches three worker tasks
+    control_server_task = await UnixControlServer(pool, path='/tmp/py_asyncio_taskpool.sock').serve_forever()
    # We block until `.task_done()` has been called once by our workers for every item placed into the queue.
    await q.join()
-    # Since we don't need any "work" done anymore, we can get rid of our control server by cancelling the task.
+    # Since we don't need any "work" done anymore, we can lock our control server by cancelling the task.
    control_server_task.cancel()
    # Since our workers should now be stuck waiting for more items to pick from the queue, but no items are left,
    # we can now safely cancel their tasks.
+    pool.lock()
    pool.stop_all()
-    # Finally, we allow for all tasks to do their cleanup (as if they need to do any) upon being cancelled.
+    # Finally we allow for all tasks to do do their cleanup, if they need to do any, upon being cancelled.
    # We block until they all return or raise an exception, but since we are not interested in any of their exceptions,
    # we just silently collect their exceptions along with their return values.
    await pool.gather_and_close(return_exceptions=True)