diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ea81f7f8de..ba1fd7f367 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -289,7 +289,7 @@ jobs:
           rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }}
           skip-docker-setup: true
       - name: "Run workspace unit tests"
-        run: RUST_TEST_THREADS=1 cargo test --workspace --lib --exclude aries-vcx-agent --exclude libvdrtools --exclude wallet_migrator
+        run: RUST_TEST_THREADS=1 cargo test --workspace --lib --exclude aries-vcx-agent --exclude libvdrtools --exclude wallet_migrator --exclude mediator
 
   test-integration-aries-vcx:
     needs: workflow-setup
@@ -402,6 +402,8 @@ jobs:
       - name: "Run integration tests"
         run: (cd agents/node/vcxagent-core && AGENCY_URL=http://localhost:8080 npm run test:integration)
 
+
+
   ##########################################################################################
   ############################   NPMJS PUBLISHING   #######################################
 
diff --git a/.github/workflows/mediator.pr.yml b/.github/workflows/mediator.pr.yml
new file mode 100644
index 0000000000..e93633ea6d
--- /dev/null
+++ b/.github/workflows/mediator.pr.yml
@@ -0,0 +1,56 @@
+name: CI mediator
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - "**"
+    paths:
+      - 'agents/rust/mediator/**'
+
+env:
+  DOCKER_BUILDKIT: 1
+  MAIN_BRANCH: main
+  URL_DOCKER_REGISTRY: ghcr.io
+  DOCKER_IMAGE_AGENCY: ghcr.io/absaoss/vcxagencynode/vcxagency-node:2.6.0
+  DOCKER_IMAGE_POOL: ghcr.io/hyperledger/aries-vcx/indy_pool_localhost:1.15.0
+
+  DOCKER_REPO_LOCAL_VDRPROXY: vdrproxy
+
+  RUST_TOOLCHAIN_VERSON: 1.70.0
+  NODE_VERSION: 18.x
+
+jobs:
+
+  test-integration-mediator:
+    runs-on: ubuntu-22.04
+    services: 
+      mysql:
+        image: mysql:latest
+        env:
+          MYSQL_DATABASE: mediator-persistence.mysql
+          MYSQL_USER: admin
+          MYSQL_PASSWORD: github.ci.password.no.prod
+          MYSQL_ROOT_PASSWORD: github.ci.password.no.prod
+        ports:
+          - '3326:3306'
+    env:
+      MYSQL_URL: mysql://admin:github.ci.password.no.prod@localhost:3326/mediator-persistence.mysql
+    steps:
+      - name: "Git checkout"
+        uses: actions/checkout@v3
+      - name: "Setup rust testing environment"
+        uses: ./.github/actions/setup-testing-rust
+        with:
+          rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }}
+          skip-docker-setup: true
+          skip-vdrproxy-setup: true
+      - name: Install prerequisites (sqlx)
+        # uses: Swatinem/rust-cache@v2
+        run: cargo install sqlx-cli
+      - name: Setup database
+        run: DATABASE_URL=${MYSQL_URL} sqlx migrate run --source agents/rust/mediator/mediation/migrations
+      - name: "Run mediator integration tests"
+        run: cargo run --bin mediator & sleep 5 && cargo test --verbose --package mediator -- --nocapture;
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 9889f1a9da..8a3009ce89 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -229,9 +229,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
@@ -622,6 +622,67 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "axum"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "bitflags 1.3.2",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-macros"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.69"
@@ -690,9 +751,9 @@ dependencies = [
 
 [[package]]
 name = "blocking"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94c4ef1f913d78636d78d538eec1f18de81e481f44b1be0a81060090530846e1"
+checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a"
 dependencies = [
  "async-channel",
  "async-lock",
@@ -778,9 +839,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-platform"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
+checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36"
 dependencies = [
  "serde",
 ]
@@ -869,6 +930,39 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "client-tui"
+version = "0.1.1"
+dependencies = [
+ "aries_vcx_core",
+ "axum",
+ "client-webapi",
+ "cursive",
+ "futures",
+ "log",
+ "mediation",
+ "mediator",
+ "messages",
+ "serde_json",
+ "tokio",
+]
+
+[[package]]
+name = "client-webapi"
+version = "0.1.1"
+dependencies = [
+ "aries_vcx_core",
+ "axum",
+ "log",
+ "mediation",
+ "mediator",
+ "messages",
+ "reqwest",
+ "serde_json",
+ "tokio",
+ "tower-http",
+]
+
 [[package]]
 name = "cmake"
 version = "0.1.50"
@@ -987,6 +1081,16 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-queue"
 version = "0.3.8"
@@ -1006,6 +1110,31 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "crossterm"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+dependencies = [
+ "bitflags 1.3.2",
+ "crossterm_winapi",
+ "libc",
+ "mio",
+ "parking_lot",
+ "signal-hook",
+ "signal-hook-mio",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -1026,6 +1155,48 @@ dependencies = [
  "syn 2.0.38",
 ]
 
+[[package]]
+name = "cursive"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5438eb16bdd8af51b31e74764fef5d0a9260227a5ec82ba75c9d11ce46595839"
+dependencies = [
+ "ahash",
+ "cfg-if",
+ "crossbeam-channel",
+ "crossterm",
+ "cursive_core",
+ "lazy_static",
+ "libc",
+ "log",
+ "maplit",
+ "ncurses",
+ "signal-hook",
+ "term_size",
+ "unicode-segmentation",
+ "unicode-width",
+]
+
+[[package]]
+name = "cursive_core"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4db3b58161228d0dcb45c7968c5e74c3f03ad39e8983e58ad7d57061aa2cd94d"
+dependencies = [
+ "ahash",
+ "crossbeam-channel",
+ "enum-map",
+ "enumset",
+ "lazy_static",
+ "log",
+ "num",
+ "owning_ref",
+ "time 0.3.20",
+ "unicode-segmentation",
+ "unicode-width",
+ "xi-unicode",
+]
+
 [[package]]
 name = "curve25519-dalek"
 version = "4.1.1"
@@ -1507,6 +1678,47 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "enum-map"
+version = "2.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c188012f8542dee7b3996e44dd89461d64aa471b0a7c71a1ae2f595d259e96e5"
+dependencies = [
+ "enum-map-derive",
+]
+
+[[package]]
+name = "enum-map-derive"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04d0b288e3bb1d861c4403c1774a6f7a798781dfc519b3647df2a3dd4ae95f25"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "enumset"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d"
+dependencies = [
+ "enumset_derive",
+]
+
+[[package]]
+name = "enumset_derive"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08b6c6ab82d70f08844964ba10c7babb716de2ecaeab9be5717918a5177d3af"
+dependencies = [
+ "darling 0.20.3",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "env_logger"
 version = "0.9.3"
@@ -1541,25 +1753,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
 dependencies = [
- "errno-dragonfly",
  "libc",
  "windows-sys",
 ]
 
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "error-chain"
 version = "0.10.0"
@@ -1623,6 +1824,12 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "fast_qr"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcb3b08010bdea9b4ab23deabd626509ee241a793b7da9148d9101c677adcf4d"
+
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -1662,9 +1869,9 @@ checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
 
 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -2054,6 +2261,12 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "http-range-header"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
+
 [[package]]
 name = "httparse"
 version = "1.8.0"
@@ -2156,6 +2369,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown 0.12.3",
+ "serde",
 ]
 
 [[package]]
@@ -2166,6 +2380,7 @@ checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
  "equivalent",
  "hashbrown 0.14.1",
+ "serde",
 ]
 
 [[package]]
@@ -2397,7 +2612,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
  "hermit-abi 0.3.3",
- "rustix 0.38.17",
+ "rustix 0.38.19",
  "windows-sys",
 ]
 
@@ -2436,9 +2651,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
 
 [[package]]
 name = "jobserver"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
 dependencies = [
  "libc",
 ]
@@ -2487,9 +2702,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "libloading"
@@ -2592,9 +2807,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 
 [[package]]
 name = "local-channel"
@@ -2653,6 +2868,18 @@ dependencies = [
  "hashbrown 0.14.1",
 ]
 
+[[package]]
+name = "maplit"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
+
+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
 [[package]]
 name = "md-5"
 version = "0.10.6"
@@ -2663,6 +2890,54 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "mediation"
+version = "0.2.3"
+dependencies = [
+ "async-trait",
+ "axum",
+ "axum-macros",
+ "dotenvy",
+ "env_logger 0.10.0",
+ "futures",
+ "log",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "sqlx",
+ "tokio",
+]
+
+[[package]]
+name = "mediator"
+version = "0.1.1"
+dependencies = [
+ "anyhow",
+ "aries-vcx",
+ "aries_vcx_core",
+ "async-trait",
+ "axum",
+ "axum-macros",
+ "diddoc_legacy",
+ "dotenvy",
+ "env_logger 0.10.0",
+ "fast_qr",
+ "futures",
+ "log",
+ "mediation",
+ "messages",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "thiserror",
+ "tokio",
+ "tower-http",
+ "url",
+ "uuid 1.4.1",
+]
+
 [[package]]
 name = "memchr"
 version = "2.6.4"
@@ -2870,6 +3145,17 @@ dependencies = [
  "tempfile",
 ]
 
+[[package]]
+name = "ncurses"
+version = "5.101.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e2c5d34d72657dc4b638a1c25d40aae81e4f1c699062f72f467237920752032"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+]
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -2886,6 +3172,19 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
+[[package]]
+name = "num"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+dependencies = [
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.4"
@@ -2915,6 +3214,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "num-complex"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.45"
@@ -2936,11 +3244,22 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "num-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
  "libm",
@@ -2956,6 +3275,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "object"
 version = "0.32.1"
@@ -3027,6 +3355,15 @@ version = "6.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac"
 
+[[package]]
+name = "owning_ref"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff55baddef9e4ad00f88b6c743a2a8062d4c6ade126c2a528644b8e444d52ce"
+dependencies = [
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "parking"
 version = "2.1.1"
@@ -3105,6 +3442,26 @@ dependencies = [
  "siphasher",
 ]
 
+[[package]]
+name = "pin-project"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "pin-project-lite"
 version = "0.2.13"
@@ -3245,9 +3602,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
@@ -3376,9 +3733,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.6"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
+checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3388,9 +3745,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.9"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
+checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3399,9 +3756,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.5"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33"
 
 [[package]]
 name = "reqwest"
@@ -3531,14 +3888,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.17"
+version = "0.38.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7"
+checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
 dependencies = [
  "bitflags 2.4.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.8",
+ "linux-raw-sys 0.4.10",
  "windows-sys",
 ]
 
@@ -3654,27 +4011,27 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.189"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3692,6 +4049,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
+dependencies = [
+ "itoa",
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -3704,6 +4071,35 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_with"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
+dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.0.2",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time 0.3.20",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c"
+dependencies = [
+ "darling 0.20.3",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -3761,6 +4157,27 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "signal-hook"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
+dependencies = [
+ "libc",
+ "signal-hook-registry",
+]
+
+[[package]]
+name = "signal-hook-mio"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
+dependencies = [
+ "libc",
+ "mio",
+ "signal-hook",
+]
+
 [[package]]
 name = "signal-hook-registry"
 version = "1.4.1"
@@ -4072,6 +4489,12 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -4167,6 +4590,12 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
 [[package]]
 name = "synstructure"
 version = "0.12.6"
@@ -4209,10 +4638,20 @@ dependencies = [
  "cfg-if",
  "fastrand 2.0.1",
  "redox_syscall 0.3.5",
- "rustix 0.38.17",
+ "rustix 0.38.19",
  "windows-sys",
 ]
 
+[[package]]
+name = "term_size"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4129646ca0ed8f45d09b929036bafad5377103edd06e50bf574b353d2b08d9"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "termcolor"
 version = "1.3.0"
@@ -4272,6 +4711,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
 dependencies = [
  "itoa",
+ "libc",
+ "num_threads",
  "serde",
  "time-core",
  "time-macros",
@@ -4309,9 +4750,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
  "backtrace",
  "bytes",
@@ -4400,6 +4841,47 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
+dependencies = [
+ "bitflags 2.4.0",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-range-header",
+ "pin-project-lite",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
 [[package]]
 name = "tower-service"
 version = "0.3.2"
@@ -4519,6 +5001,12 @@ version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
+[[package]]
+name = "unicode-width"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
@@ -5051,6 +5539,12 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "xi-unicode"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a"
+
 [[package]]
 name = "zeroize"
 version = "1.6.0"
@@ -5124,11 +5618,10 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
+version = "2.0.9+zstd.1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
 dependencies = [
  "cc",
- "libc",
  "pkg-config",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 831240db36..a4994fc3b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,6 +10,9 @@ members = [
     "messages",
     "shared_vcx",
     "diddoc_legacy",
+    "agents/rust/mediator",
+    "agents/rust/mediator/client-webapi",
+    "agents/rust/mediator/client-tui",
     "agents/rust/aries-vcx-agent",
     "wrappers/vcx-napi-rs",
     "aries_vcx_core",
diff --git a/agents/rust/mediator/.cargo/config.toml b/agents/rust/mediator/.cargo/config.toml
new file mode 100644
index 0000000000..5dbf66b1f3
--- /dev/null
+++ b/agents/rust/mediator/.cargo/config.toml
@@ -0,0 +1,2 @@
+# [build]
+# target-dir = "../target"
diff --git a/agents/rust/mediator/.gitignore b/agents/rust/mediator/.gitignore
new file mode 100644
index 0000000000..9d60d03a8f
--- /dev/null
+++ b/agents/rust/mediator/.gitignore
@@ -0,0 +1,3 @@
+/target
+.vscode
+.err
\ No newline at end of file
diff --git a/agents/rust/mediator/Cargo.toml b/agents/rust/mediator/Cargo.toml
new file mode 100644
index 0000000000..ddaa147abe
--- /dev/null
+++ b/agents/rust/mediator/Cargo.toml
@@ -0,0 +1,40 @@
+[package]
+name = "mediator"
+version = "0.1.1"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[features]
+default = ["client"]
+client = []
+
+[dependencies]
+anyhow = "1.0.75"
+aries-vcx = { path = "../../../aries_vcx" }
+aries_vcx_core = { path = "../../../aries_vcx_core", features = [
+    "vdrtools_wallet",
+] }
+async-trait = "0.1.73"
+axum = "0.6"
+axum-macros = "0.3.8"
+diddoc_legacy = { path = "../../../diddoc_legacy" }
+dotenvy = "0.15"
+env_logger = "0.10.0"
+fast_qr = { version = "0.10.2", features = ["svg"] }
+futures = "0.3.28"
+log = "0.4.20"
+messages = { path = "../../../messages" }
+reqwest = { version = "0.11.20", features = ["json"] }
+serde = "1.0.188"
+serde_json = "1.0.106"
+sqlx = "0.7"
+thiserror = "1.0.49"
+tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
+tower-http = { version = "0.4.4", features = ["catch-panic"] }
+url = "2.4.1"
+uuid = "1.4.1"
+mediation = { path = "./mediation" }
+
+[dev-dependencies]
+reqwest = { version = "0.11.20", features = ["blocking"] }
diff --git a/agents/rust/mediator/README.md b/agents/rust/mediator/README.md
new file mode 100644
index 0000000000..8dab48f829
--- /dev/null
+++ b/agents/rust/mediator/README.md
@@ -0,0 +1,80 @@
+# Aries VCX Mediator
+
+A mediator service for Aries Agents.
+
+**Status**: Dev
+
+## Build
+
+This project depends on `aries-vcx` and is tightly integrated to work with it.
+As such we expect this `mediator` module to be in a subdirectory of aries-vcx repo.
+You may transplant it, but expect to change the `Cargo.toml` and adjust the dependencies on aries modules manually.
+
+When ready it's simple to build.
+
+```bash
+# Dev environment build
+cargo build
+```
+
+## Usage
+
+You can run and test the produced binaries using cargo.
+
+```bash
+cargo run --bin mediator
+```
+
+```bash
+# For testing / demo purposes
+cargo run --bin client-tui
+
+# To also see panic and debug info produced by tui
+cargo run --bin client-tui 2> err || cat  err
+```
+
+### Configurable Options
+
+Currently the mediator reads the following environment variables.
+
+```yaml
+`ENDPOINT_ROOT`: 
+- **Description**: This is the address at which the mediator will listen for connections.
+- **Default**: "127.0.0.1:8005"
+- **Usage**: `ENDPOINT_ROOT=127.0.0.1:3000 cargo run`
+
+`MYSQL_URL`: 
+- **Description**: MySQL url for the MYSQL database used for mediator persistence. 
+- **Default**: -
+- **Usage**: `MYSQL_URL=mysql://admin:password1235@localhost:3306/mediator-persistence.db`
+```
+
+## API
+
+Currently exposed endpoints.
+
+```yaml
+`/register`:
+- **Description** : | 
+    Shows an Aries Out Of Band (OOB) invitation which can be used to connect to the mediator using a conformant Aries Agent.
+    Use `Accept` header with value "application/json" to receive same in json format.
+
+`/register.json`:
+- **Description** : Returns OOB invitation in json format.
+```
+
+```yaml
+`/didcomm`:
+- **Description** : | 
+    Endpoint for Aries DIDCOMM communication. 
+    Encrypted Aries messages (envelops) can be passed and received from this endpoint in json serialized format.
+```
+
+### Client API
+
+```yaml
+`/client/register-using-oob`:
+- **Input**: Json body containing OOB invite to connect to.
+- **Description** : Attempts to connect to the Aries service defined in the OOB invite using DIDCOMM channel. 
+
+```
diff --git a/agents/rust/mediator/client-tui/Cargo.toml b/agents/rust/mediator/client-tui/Cargo.toml
new file mode 100644
index 0000000000..e5f8e3585b
--- /dev/null
+++ b/agents/rust/mediator/client-tui/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "client-tui"
+version = "0.1.1"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+aries_vcx_core = { path = "../../../../aries_vcx_core", features = [
+    "vdrtools_wallet",
+] }
+axum = "0.6.20"
+client-webapi = { path = "../client-webapi" }
+cursive = { version = "0.20.0", features = ["crossterm-backend"] }
+futures = "0.3.28"
+log = "0.4.20"
+mediation = { path = "../mediation" }
+mediator = { path = ".." }
+messages = { path = "../../../../messages" }
+serde_json = "1.0.107"
+
+tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
diff --git a/agents/rust/mediator/client-tui/src/main.rs b/agents/rust/mediator/client-tui/src/main.rs
new file mode 100644
index 0000000000..5cba16f032
--- /dev/null
+++ b/agents/rust/mediator/client-tui/src/main.rs
@@ -0,0 +1,22 @@
+/// Aries Agent TUI
+mod tui;
+#[tokio::main]
+async fn main() {
+    use mediator::{
+        aries_agent::AgentBuilder,
+        utils::binary_utils::{load_dot_env, setup_logging},
+    };
+
+    load_dot_env();
+    setup_logging();
+    log::info!("TUI initializing!");
+    let agent = AgentBuilder::new_demo_agent().await.unwrap();
+    tui::init_tui(agent).await;
+}
+
+// fn main() {
+//     print!(
+//         "This is a placeholder binary. Please enable \"client_tui\" feature to to build the \
+//          functional client_tui binary."
+//     )
+// }
diff --git a/agents/rust/mediator/client-tui/src/tui.rs b/agents/rust/mediator/client-tui/src/tui.rs
new file mode 100644
index 0000000000..59f0a8e1a7
--- /dev/null
+++ b/agents/rust/mediator/client-tui/src/tui.rs
@@ -0,0 +1,139 @@
+use std::sync::Arc;
+
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
+use axum::{extract::State, Json};
+use client_webapi::http_routes::handle_register;
+use cursive::{
+    direction::Orientation,
+    event::Key,
+    view::{Nameable, SizeConstraint},
+    views::{
+        Dialog, DummyView, LinearLayout, Panel, ResizedView, ScrollView, SelectView, TextArea,
+        TextView,
+    },
+    Cursive, CursiveExt, View,
+};
+use futures::executor::block_on;
+use log::info;
+use mediation::storage::MediatorPersistence;
+use mediator::aries_agent::Agent;
+use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
+
+pub async fn init_tui<T: BaseWallet + 'static, P: MediatorPersistence>(agent: Agent<T, P>) {
+    let mut cursive = Cursive::new();
+    cursive.add_global_callback(Key::Esc, |s| s.quit());
+    cursive.set_user_data(Arc::new(agent));
+
+    let mut main = LinearLayout::horizontal().with_name("main");
+    let endpoint_selector = endpoints_ui::<T, P>();
+    main.get_mut().add_child(endpoint_selector);
+    cursive.add_layer(main);
+    cursive.run()
+}
+
+pub fn endpoints_ui<T: BaseWallet + 'static, P: MediatorPersistence>() -> Panel<LinearLayout> {
+    let mut endpoint_selector = SelectView::new();
+    // Set available endpoints
+    endpoint_selector.add_item_str("/client/register");
+    endpoint_selector.add_item_str("/client/trustping");
+
+    endpoint_selector.set_on_submit(|s, endpoint: &str| {
+        // Match ui generators for available endpoints
+        let view = match endpoint {
+            "/client/register" => client_register_ui::<T, P>(),
+            "/client/contacts" => contact_selector_ui::<T, P>(s),
+            _ => dummy_ui(),
+        };
+        // Replace previously exposed ui
+        s.find_name::<LinearLayout>("main").unwrap().remove_child(1);
+        s.find_name::<LinearLayout>("main")
+            .unwrap()
+            .insert_child(1, view);
+    });
+
+    make_standard(endpoint_selector, Orientation::Vertical).title("Select endpoint")
+}
+
+pub fn client_register_ui<T: BaseWallet + 'static, P: MediatorPersistence>() -> Panel<LinearLayout>
+{
+    let input = TextArea::new().with_name("oob_text_area");
+    let input = ResizedView::new(
+        SizeConstraint::AtLeast(20),
+        SizeConstraint::AtLeast(5),
+        input,
+    );
+    let input = Dialog::around(input)
+        .button("Clear", |s| {
+            s.find_name::<TextArea>("oob_text_area")
+                .unwrap()
+                .set_content("");
+        })
+        .button("Connect", client_register_connect_cb::<T, P>)
+        .title("OOB Invite");
+    let input = Panel::new(input);
+
+    let output = ScrollView::new(ResizedView::new(
+        SizeConstraint::AtLeast(20),
+        SizeConstraint::Free,
+        TextView::new("").with_name("client_register_result"),
+    ));
+    let output = Panel::new(output).title("Result");
+
+    let ui = LinearLayout::horizontal().child(input).child(output);
+
+    make_standard(ui, Orientation::Horizontal).title("Register client using Out Of Band Invitation")
+}
+
+pub fn client_register_connect_cb<T: BaseWallet + 'static, P: MediatorPersistence>(
+    s: &mut Cursive,
+) {
+    let oob_text_area = s.find_name::<TextArea>("oob_text_area").unwrap();
+    let mut output = s.find_name::<TextView>("client_register_result").unwrap();
+    let oob_text = oob_text_area.get_content();
+    info!("{:#?}", oob_text);
+
+    let oob_invite = match serde_json::from_str::<OOBInvitation>(oob_text) {
+        Ok(oob_invite) => oob_invite,
+        Err(err) => {
+            output.set_content(format!("{:?}", err));
+            return;
+        }
+    };
+    info!("{:#?}", oob_invite);
+    let agent: &mut Arc<Agent<T, P>> = s.user_data().expect("Userdata should contain Agent");
+
+    output.set_content(format!("{:#?}", oob_invite));
+    match block_on(handle_register(State(agent.to_owned()), Json(oob_invite))) {
+        Ok(Json(res_json)) => output.set_content(serde_json::to_string_pretty(&res_json).unwrap()),
+        Err(err) => output.set_content(err),
+    };
+}
+
+fn dummy_ui() -> Panel<LinearLayout> {
+    let ui = DummyView;
+    make_standard(ui, Orientation::Horizontal)
+}
+
+fn make_standard(view: impl View, orientation: Orientation) -> Panel<LinearLayout> {
+    Panel::new(LinearLayout::new(orientation).child(view))
+}
+
+// fn client_trustping_ui(s: &mut Cursive) -> Panel<LinearLayout> {
+//     contact_selector_ui(s)
+// }
+
+pub fn contact_selector_ui<T: BaseWallet + 'static, P: MediatorPersistence>(
+    s: &mut Cursive,
+) -> Panel<LinearLayout> {
+    let mut contact_selector = SelectView::new();
+    // Set available contacts
+    let agent: &mut Arc<Agent<T, P>> = s
+        .user_data()
+        .expect("cursive must be initialised with state arc agent ");
+    let contact_list_maybe = block_on(agent.list_contacts());
+    let contact_list = contact_list_maybe.unwrap_or_default();
+    for (acc_name, auth_pubkey) in contact_list.iter() {
+        contact_selector.add_item(acc_name.clone(), auth_pubkey.clone())
+    }
+    make_standard(contact_selector, Orientation::Vertical).title("Select contact")
+}
diff --git a/agents/rust/mediator/client-webapi/Cargo.toml b/agents/rust/mediator/client-webapi/Cargo.toml
new file mode 100644
index 0000000000..7b4ec25f67
--- /dev/null
+++ b/agents/rust/mediator/client-webapi/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "client-webapi"
+version = "0.1.1"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+aries_vcx_core = { path = "../../../../aries_vcx_core", features = [
+    "vdrtools_wallet",
+] }
+axum = "0.6.20"
+log = "0.4.20"
+mediation = { path = "../mediation" }
+mediator = { version = "0.1.1", path = ".." }
+messages = { path = "../../../../messages" }
+reqwest = "0.11.22"
+serde_json = "1.0.107"
+tokio = { version = "1", features = ["rt-multi-thread", "macros"] }
+tower-http = { version = "0.4.4", features = ["catch-panic"] }
diff --git a/agents/rust/mediator/client-webapi/src/http_routes.rs b/agents/rust/mediator/client-webapi/src/http_routes.rs
new file mode 100644
index 0000000000..04b8f40b0a
--- /dev/null
+++ b/agents/rust/mediator/client-webapi/src/http_routes.rs
@@ -0,0 +1,35 @@
+use std::{collections::VecDeque, sync::Arc};
+
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
+use axum::{extract::State, routing::post, Json, Router};
+use mediation::storage::MediatorPersistence;
+use mediator::aries_agent::{transports::AriesReqwest, Agent, ArcAgent};
+use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
+use serde_json::{json, Value};
+
+pub async fn handle_register(
+    State(agent): State<ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>>,
+    Json(oob_invite): Json<OOBInvitation>,
+) -> Result<Json<Value>, String> {
+    let mut aries_transport = AriesReqwest {
+        response_queue: VecDeque::new(),
+        client: reqwest::Client::new(),
+    };
+    let state = agent
+        .establish_connection(oob_invite, &mut aries_transport)
+        .await
+        .map_err(|err| format!("{err:?}"))?;
+    Ok(Json(json!({
+        "status": "success",
+        "connection_completed": state
+    })))
+}
+
+pub async fn build_client_router<T: BaseWallet + 'static, P: MediatorPersistence>(
+    agent: Agent<T, P>,
+) -> Router {
+    Router::default()
+        .route("/client/register-using-oob", post(handle_register))
+        .layer(tower_http::catch_panic::CatchPanicLayer::new())
+        .with_state(Arc::new(agent))
+}
diff --git a/agents/rust/mediator/client-webapi/src/lib.rs b/agents/rust/mediator/client-webapi/src/lib.rs
new file mode 100644
index 0000000000..5db9fa2065
--- /dev/null
+++ b/agents/rust/mediator/client-webapi/src/lib.rs
@@ -0,0 +1 @@
+pub mod http_routes;
diff --git a/agents/rust/mediator/client-webapi/src/main.rs b/agents/rust/mediator/client-webapi/src/main.rs
new file mode 100644
index 0000000000..39ca0208f7
--- /dev/null
+++ b/agents/rust/mediator/client-webapi/src/main.rs
@@ -0,0 +1,32 @@
+/// Client-side focused api accessible Aries Agent
+#[tokio::main]
+async fn main() {
+    use client_webapi::http_routes::build_client_router;
+    use mediator::{
+        aries_agent::AgentBuilder,
+        utils::binary_utils::{load_dot_env, setup_logging},
+    };
+
+    load_dot_env();
+    setup_logging();
+    log::info!("Putting up local web interface controlling client");
+    let endpoint_root = std::env::var("ENDPOINT_ROOT").unwrap_or("127.0.0.1:3003".into());
+    log::info!("Client web endpoint root address {}", endpoint_root);
+    let agent = AgentBuilder::new_demo_agent().await.unwrap();
+    let app_router = build_client_router(agent).await;
+    axum::Server::bind(
+        &endpoint_root
+            .parse()
+            .expect("Pass an address to listen on like IP:PORT"),
+    )
+    .serve(app_router.into_make_service())
+    .await
+    .unwrap();
+}
+
+// fn main() {
+//     print!(
+//         "This is a placeholder binary. Please enable \"client_tui\" feature to to build the \
+//          functional client_tui binary."
+//     )
+// }
diff --git a/agents/rust/mediator/mediation/.github/workflows/rust-basic.yml b/agents/rust/mediator/mediation/.github/workflows/rust-basic.yml
new file mode 100644
index 0000000000..ae4673f355
--- /dev/null
+++ b/agents/rust/mediator/mediation/.github/workflows/rust-basic.yml
@@ -0,0 +1,130 @@
+name: Rust basic workflow
+
+on:
+  push:
+    branches: [ "main", "ci-integration-test", "ci-cd", "dev", aries-vcx-mediator-integration]
+  pull_request:
+    branches: [ "main", "ci-integration-test", "ci-cd", "dev", aries-vcx-mediator-integration]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  check:
+    name: Check for obvious errors
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Cargo cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          target/
+        key: ${{ runner.os }}-cargo-check-cache-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-
+    - name: cargo check
+      run: cargo check --verbose
+  build:
+    needs: check
+    name: Build and cache
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Cargo build cache
+      # Restore / save build cache to speed up operations
+      # If no cache was found and job succeeds cache of paths will be created
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          target/
+        key: ${{ runner.os }}-cargo-build-cache-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-    
+    - name: Build
+      run: cargo build --verbose  
+    - name: Upload built binary
+      uses: actions/upload-artifact@v3.1.2
+      with:
+        # Artifact name
+        name: xum-test-server # optional
+        # A file, directory or wildcard pattern that describes what to upload
+        path: /home/runner/work/axum-test-server/axum-test-server/target/debug/xum-test-server
+        # The desired behavior if no files are found using the provided path.
+        # Available Options:
+        #    warn: Output a warning but do not fail the action
+        #    error: Fail the action with an error message
+        #    ignore: Do not output any warnings or errors, the action does not fail
+        if-no-files-found: warn # optional, default is warn
+        # Duration after which artifact will expire in days. 0 means using default retention.
+        # Minimum 1 day. Maximum 90 days unless changed from the repository settings page.
+        retention-days: 1 # optional
+  lint:
+    if: github.event_name == 'pull_request'
+    name: Lint Action
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Cargo lint cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          target/
+        key: ${{ runner.os }}-cargo-lint-cache-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-        
+    - name: Run linters
+      run: cargo clippy --verbose --no-deps --all-targets -- -D warnings
+  integration_test:
+    needs: check
+    runs-on: ubuntu-latest
+    name: Integration testing
+    services: 
+      mysql:
+        image: mysql:latest
+        env:
+          MYSQL_DATABASE: xum.mysql.db
+          MYSQL_USER: admin
+          MYSQL_PASSWORD: github.ci.password.no.prod
+          MYSQL_ROOT_PASSWORD: github.ci.password.no.prod
+        ports:
+          - '3306:3306'
+    env:
+      MYSQL_URL: mysql://admin:github.ci.password.no.prod@localhost:3306/xum.mysql.db
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Cargo test cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          target/
+        key: ${{ runner.os }}-cargo-test-cache-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-
+    - name: Install prerequisites (sqlx)
+      run: cargo install sqlx-cli || true
+    - name: Setup database
+      run: DATABASE_URL=${MYSQL_URL} sqlx migrate run
+    - name: E2E test endpoints
+      run: |
+        cargo run &
+          sleep 5 && 
+          cargo test --verbose -- --nocapture
diff --git a/agents/rust/mediator/mediation/.gitignore b/agents/rust/mediator/mediation/.gitignore
new file mode 100644
index 0000000000..f2f744e26e
--- /dev/null
+++ b/agents/rust/mediator/mediation/.gitignore
@@ -0,0 +1,5 @@
+/target
+.vscode
+
+.env
+docker
\ No newline at end of file
diff --git a/agents/rust/mediator/mediation/Cargo.lock b/agents/rust/mediator/mediation/Cargo.lock
new file mode 100644
index 0000000000..87952236f0
--- /dev/null
+++ b/agents/rust/mediator/mediation/Cargo.lock
@@ -0,0 +1,2451 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "addr2line"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
+[[package]]
+name = "ahash"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "atoi"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "axum"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "bitflags 1.3.2",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "serde_json",
+ "serde_path_to_error",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "tokio",
+ "tower",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-macros"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdca6a10ecad987bda04e95606ef85a5417dcaac1a78455242d72e031e2b6b62"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "base64"
+version = "0.21.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "num-traits",
+ "serde",
+ "windows-targets",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "deranged"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "errno"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "etcetera"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
+dependencies = [
+ "cfg-if",
+ "home",
+ "windows-sys",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
+[[package]]
+name = "finl_unicode"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6"
+
+[[package]]
+name = "flume"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "spin 0.9.8",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-intrusive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
+dependencies = [
+ "futures-core",
+ "lock_api",
+ "parking_lot",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+
+[[package]]
+name = "futures-util"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "gimli"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+
+[[package]]
+name = "h2"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap 1.9.3",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+dependencies = [
+ "ahash",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.1",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "home"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "http"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "humantime"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+
+[[package]]
+name = "hyper"
+version = "0.14.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2 0.4.9",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+dependencies = [
+ "bytes",
+ "hyper",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.1",
+ "serde",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+dependencies = [
+ "hermit-abi",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "itertools"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+dependencies = [
+ "spin 0.5.2",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.149"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
+
+[[package]]
+name = "libm"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
+
+[[package]]
+name = "libsqlite3-sys"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+
+[[package]]
+name = "lock_api"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
+[[package]]
+name = "memchr"
+version = "2.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+dependencies = [
+ "adler",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+dependencies = [
+ "libc",
+ "wasi",
+ "windows-sys",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+dependencies = [
+ "lazy_static",
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151"
+dependencies = [
+ "byteorder",
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
+dependencies = [
+ "hermit-abi",
+ "libc",
+]
+
+[[package]]
+name = "object"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "openssl"
+version = "0.10.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
+dependencies = [
+ "bitflags 2.4.0",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.93"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+
+[[package]]
+name = "pin-project"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d119d7c7ca818f8a53c300863d4f87566aac09943aef5b355bb83969dae75d87"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "465c6fc0621e4abc4187a2bda0937bfd4f722c2730b29562e19689ea796c9a4b"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56d84fdd47036b038fc80dd333d10b6aab10d5d31f4a366e20014def75328d33"
+
+[[package]]
+name = "reqwest"
+version = "0.11.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "hyper-tls",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8"
+dependencies = [
+ "byteorder",
+ "const-oid",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+
+[[package]]
+name = "rustix"
+version = "0.38.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a74ee2d7c2581cd139b42447d7d9389b889bdaad3a73f1ebb16f2a3237bb19c"
+dependencies = [
+ "bitflags 2.4.0",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "schannel"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "security-framework"
+version = "2.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.188"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.188"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_path_to_error"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4beec8bce849d58d06238cb50db2e1c417cfeafa4c63f692b15c82b7c80f8335"
+dependencies = [
+ "itoa",
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ca3b16a3d82c4088f343b7480a93550b3eabe1a358569c2dfe38bbcead07237"
+dependencies = [
+ "base64",
+ "chrono",
+ "hex",
+ "indexmap 1.9.3",
+ "indexmap 2.0.2",
+ "serde",
+ "serde_json",
+ "serde_with_macros",
+ "time",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e6be15c453eb305019bfa438b1593c731f36a289a7853f7707ee29e870b3b3c"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+dependencies = [
+ "digest",
+ "rand_core",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+
+[[package]]
+name = "socket2"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "sqlformat"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85"
+dependencies = [
+ "itertools",
+ "nom",
+ "unicode_categories",
+]
+
+[[package]]
+name = "sqlx"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33"
+dependencies = [
+ "sqlx-core",
+ "sqlx-macros",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+]
+
+[[package]]
+name = "sqlx-core"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d"
+dependencies = [
+ "ahash",
+ "atoi",
+ "byteorder",
+ "bytes",
+ "crc",
+ "crossbeam-queue",
+ "dotenvy",
+ "either",
+ "event-listener",
+ "futures-channel",
+ "futures-core",
+ "futures-intrusive",
+ "futures-io",
+ "futures-util",
+ "hashlink",
+ "hex",
+ "indexmap 2.0.2",
+ "log",
+ "memchr",
+ "once_cell",
+ "paste",
+ "percent-encoding",
+ "serde",
+ "serde_json",
+ "sha2",
+ "smallvec",
+ "sqlformat",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "sqlx-macros"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "sqlx-core",
+ "sqlx-macros-core",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sqlx-macros-core"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc"
+dependencies = [
+ "dotenvy",
+ "either",
+ "heck",
+ "hex",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "serde",
+ "serde_json",
+ "sha2",
+ "sqlx-core",
+ "sqlx-mysql",
+ "sqlx-postgres",
+ "sqlx-sqlite",
+ "syn 1.0.109",
+ "tempfile",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "sqlx-mysql"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db"
+dependencies = [
+ "atoi",
+ "base64",
+ "bitflags 2.4.0",
+ "byteorder",
+ "bytes",
+ "crc",
+ "digest",
+ "dotenvy",
+ "either",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "generic-array",
+ "hex",
+ "hkdf",
+ "hmac",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "percent-encoding",
+ "rand",
+ "rsa",
+ "serde",
+ "sha1",
+ "sha2",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "tracing",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-postgres"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624"
+dependencies = [
+ "atoi",
+ "base64",
+ "bitflags 2.4.0",
+ "byteorder",
+ "crc",
+ "dotenvy",
+ "etcetera",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-util",
+ "hex",
+ "hkdf",
+ "hmac",
+ "home",
+ "itoa",
+ "log",
+ "md-5",
+ "memchr",
+ "once_cell",
+ "rand",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "smallvec",
+ "sqlx-core",
+ "stringprep",
+ "thiserror",
+ "tracing",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-sqlite"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f"
+dependencies = [
+ "atoi",
+ "flume",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-intrusive",
+ "futures-util",
+ "libsqlite3-sys",
+ "log",
+ "percent-encoding",
+ "serde",
+ "sqlx-core",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "stringprep"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6"
+dependencies = [
+ "finl_unicode",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "system-configuration"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "redox_syscall",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.49"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "time"
+version = "0.3.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
+dependencies = [
+ "deranged",
+ "itoa",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
+[[package]]
+name = "time-macros"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.33.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "pin-project-lite",
+ "socket2 0.5.4",
+ "tokio-macros",
+ "windows-sys",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
+[[package]]
+name = "unicode_categories"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
+
+[[package]]
+name = "url"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.38",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
+name = "web-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "whoami"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22fc3756b8a9133049b26c7f61ab35416c130e8c09b660f5b3958b446f52cc50"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys",
+]
+
+[[package]]
+name = "xum-test-server"
+version = "0.2.3"
+dependencies = [
+ "async-trait",
+ "axum",
+ "axum-macros",
+ "dotenvy",
+ "env_logger",
+ "futures",
+ "log",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "serde_with",
+ "sqlx",
+ "tokio",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
diff --git a/agents/rust/mediator/mediation/Cargo.toml b/agents/rust/mediator/mediation/Cargo.toml
new file mode 100644
index 0000000000..b8bdb6c90a
--- /dev/null
+++ b/agents/rust/mediator/mediation/Cargo.toml
@@ -0,0 +1,37 @@
+[package]
+name = "mediation"
+version = "0.2.3"
+edition = "2021"
+
+[lib]
+path = "src/lib.rs"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+default = ["mysql_db", "mediator_persistence_extras"]
+# postgres_db=["sqlx/postgres"]
+mysql_db=["sqlx/mysql"]
+# any_db=["sqlx/all-databases"]
+mediator_persistence_extras = []
+
+[dependencies]
+async-trait = "0.1.72"
+axum = "0.6.18"
+dotenvy = "0.15.7"
+env_logger = "0.10.0"
+futures = "0.3.28"
+log = "0.4.19"
+serde = { version = "1.0.164", features = ["derive"] }
+serde_json = "1.0.104"
+serde_with = { version = "3.1.0", features = ["base64"] }
+sqlx = { version = "0.7", features = ["runtime-tokio"], optional = true }
+# sqlx = { version = "0.5.8", git = "https://github.com/jovfer/sqlx", branch = "feature/json_no_preserve_order_v5", features = [ "sqlite", "mysql", "json_no_preserve_order", "runtime-tokio-rustls"], optional = true }
+tokio = { version = "1.28.2", features = ["rt-multi-thread", "macros"] }
+
+# Workaround required because of bug in sqlx pre v6 https://github.com/launchbadge/sqlx/issues/2418
+# [build-dependencies]
+# syn = "1"
+
+[dev-dependencies]
+axum-macros = "0.3.8"
+reqwest = { version = "0.11.18", features = ["json", "blocking"] }
diff --git a/agents/rust/mediator/mediation/README.md b/agents/rust/mediator/mediation/README.md
new file mode 100644
index 0000000000..0f612cfee6
--- /dev/null
+++ b/agents/rust/mediator/mediation/README.md
@@ -0,0 +1,48 @@
+> 🚧🚧**WIP**🚧🚧: Integration into aries-vcx in process. See main branch for the MVP http service.
+
+# Aries mediator service (http)
+
+## History
+
+This repo was intended to be a test project to try Rust and Axum features.
+
+Over time it has turned into a ~fully functional aries mediator service supporting the following Aries concepts over ***http*** endpoints.
+
+> **Caveat**: Authentication must be handled at another layer. Integration with [aries-vcx] is intended to enable this.
+
+- [Mediator coordination protocol](https://github.com/hyperledger/aries-rfcs/blob/main/features/0211-route-coordination/README.md)
+- [Core:Routing: Forward Message](https://github.com/hyperledger/aries-rfcs/blob/main/concepts/0094-cross-domain-messaging/README.md#corerouting10forward)
+- [Pickup protocol 2.0](https://github.com/hyperledger/aries-rfcs/tree/main/features/0685-pickup-v2)
+
+[aries-vcx]: https://github.com/hyperledger/aries-vcx
+
+Original readme is available below.
+
+> # axum-test-server
+>
+> A axum server app to test and learn Rust and Axum features.
+>
+> The commits are made in such a way as to demonstrate and try one feature or workflow (refactoring) at a time.  
+> So the git log could be educative.  
+>
+> ## Some Interesting commits
+>
+> 1. [feat(main.rs): :thread: Demo server as in axum docs](https://github.com/nain-F49FF806/axum-test-server/commit/d7fceaf9b731251cdbe8642c716dfaa3a697349a)
+>
+> 2. [refactor: `use` too bring names into local namespace](https://github.com/nain-F49FF806/axum-test-server/commit/f3a58597fc05fe5353140e764d532446ff10000e)
+>
+> 3. [refactor: break off some code into module and load module in main](https://github.com/nain-F49FF806/axum-test-server/commit/253956dc30866f516f484c6ef549c55054cb9f3f)
+>
+> 4. [refactor: Use functions in sibling module by declaring their path from root crate](https://github.com/nain-F49FF806/axum-test-server/commit/f7a5020ba52876e463c86efb3390af527e09990c#r121244243)
+>
+> 5. [refactor: modules can have sub-modules, which can then be loaded by others using path from root crate (*if made public*)](https://github.com/nain-F49FF806/axum-test-server/commit/877cf3bac05d9cf786db3ae45202b2d4d9a98a5c)
+>
+> 6. [feat(json): serde macros help with serializing, deserializing from Rust structs to JSON wire format](https://github.com/nain-F49FF806/axum-test-server/commit/505ec1ec8fc6169620be235231643f678bab20ff)
+>
+>
+> ## Notess
+>
+> You can also look at a blog post with some personal notes (mostly for the Rust side) here : [running-notes-on-rust-and-axum-framework]
+>
+> [running-notes-on-rust-and-axum-framework]: https://envs.net/~nain/aries-vcx-diaries/running-notes-on-rust-and-axum-framework-ft-tutorial-course-by-brooks-builds.html
+>
\ No newline at end of file
diff --git a/agents/rust/mediator/mediation/build.rs b/agents/rust/mediator/mediation/build.rs
new file mode 100644
index 0000000000..d5068697c7
--- /dev/null
+++ b/agents/rust/mediator/mediation/build.rs
@@ -0,0 +1,5 @@
+// generated by `sqlx migrate build-script`
+fn main() {
+    // trigger recompilation when a new migration is added
+    println!("cargo:rerun-if-changed=migrations");
+}
diff --git a/agents/rust/mediator/mediation/migrations/20230810132416_3-part-data-(accounts,_recipients,_messages).sql b/agents/rust/mediator/mediation/migrations/20230810132416_3-part-data-(accounts,_recipients,_messages).sql
new file mode 100644
index 0000000000..e78b006397
--- /dev/null
+++ b/agents/rust/mediator/mediation/migrations/20230810132416_3-part-data-(accounts,_recipients,_messages).sql
@@ -0,0 +1,54 @@
+-- Add migration script here
+
+CREATE TABLE IF NOT EXISTS accounts (
+    -- metadata (total accounts registered until this account's creation)
+    seq_num SERIAL,
+    -- sequential time ordered uuid
+    -- https://dev.mysql.com/blog-archive/mysql-8-0-uuid-support/
+    account_id BINARY(16) DEFAULT (UUID_TO_BIN(UUID(),true)) NOT NULL UNIQUE,
+    -- for display purpose
+    account_name CHAR(36) GENERATED ALWAYS AS (BIN_TO_UUID(account_id)) VIRTUAL  NOT NULL,
+    -- mediator facing pubkey
+    -- UNIQUE constraint automatically creates index for fast unique checking; is reused for scanning
+    auth_pubkey VARCHAR(64) NOT NULL UNIQUE,
+    -- key used to sign messages to aries peer
+    our_signing_key VARCHAR(64) NOT NULL,
+    -- their complete did_doc, including routing keys etc (useful for wrapping messages in encryption envelope) 
+    did_doc JSON NOT NULL,
+    PRIMARY KEY(account_id)
+);
+
+
+CREATE TABLE IF NOT EXISTS recipients (
+    seq_num SERIAL,
+    account_id BINARY(16) NOT NULL,
+    recipient_key VARCHAR(64) NOT NULL UNIQUE,
+    -- UNIQUE constraint creates index to implement fast unique checking
+    -- so explicitly creating index is not needed (and will lead to duplicate index)
+    -- If removing UNIQUE above then activate the commented index below
+    -- INDEX(recipient_key)
+    PRIMARY KEY (account_id, recipient_key),
+    FOREIGN KEY (account_id) REFERENCES accounts(account_id)
+        ON DELETE CASCADE
+);
+
+
+CREATE TABLE IF NOT EXISTS messages (
+    seq_num SERIAL,
+    account_id BINARY(16) NOT NULL,
+    -- Allow nullable so that recipient_key remove key-updates are possible
+    -- without also removing associated messages
+    recipient_key VARCHAR(64) NULL, 
+    INDEX(account_id, recipient_key),
+    message_idb BINARY(16) DEFAULT (UUID_TO_BIN(UUID(),true)) NOT NULL UNIQUE,
+    -- Readable message id (for identifying message over wire)
+    message_id CHAR(36) GENERATED ALWAYS AS (BIN_TO_UUID(message_idb)) VIRTUAL,
+    -- 16MiB limit (medium blob)
+    message_data MEDIUMBLOB NOT NULL,
+    PRIMARY KEY (account_id, message_idb),
+    FOREIGN KEY (account_id) REFERENCES accounts(account_id)
+        ON DELETE CASCADE,
+    FOREIGN KEY (recipient_key) REFERENCES recipients(recipient_key)
+        ON DELETE SET NULL
+);
+
diff --git a/agents/rust/mediator/mediation/src/didcomm_types.rs b/agents/rust/mediator/mediation/src/didcomm_types.rs
new file mode 100644
index 0000000000..11d586f825
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/didcomm_types.rs
@@ -0,0 +1,232 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+pub use pickup_delivery_message_structs::*;
+use serde::{Deserialize, Serialize};
+use serde_with::skip_serializing_none;
+
+pub mod type_uri {
+    pub const FORWARD: &str = "https://didcomm.org/routing/1.0/forward";
+    pub const PICKUP_STATUS_REQ: &str = "https://didcomm.org/messagepickup/2.0/status-request";
+    pub const PICKUP_STATUS: &str = "https://didcomm.org/messagepickup/2.0/status";
+    pub const PICKUP_DELIVERY_REQ: &str = "https://didcomm.org/messagepickup/2.0/delivery-request";
+    pub const PICKUP_DELIVERY: &str = "https://didcomm.org/messagepickup/2.0/delivery";
+    pub const PICKUP_RECEIVED: &str = "https://didcomm.org/messagepickup/2.0/messages-received";
+}
+
+#[derive(Debug, Serialize, Deserialize, sqlx::FromRow)]
+pub struct ForwardMsg {
+    #[serde(rename = "@type")]
+    _type: String,
+    #[serde(rename = "to")]
+    pub recipient_key: String,
+    #[serde(rename = "msg")]
+    pub message_data: String,
+}
+
+// impl ForwardMsg {
+//     pub fn default_alice() -> ForwardMsg {
+//         ForwardMsg {
+//             _type: type_uri::FORWARD.to_owned(),
+//             recipient_key: "Alice".to_owned(),
+//             message: "Hello!".to_owned(),
+//         }
+//     }
+//     pub fn new(recipient_key: &str, message: &str) -> ForwardMsg {
+//         ForwardMsg {
+//             _type: type_uri::FORWARD.to_string(),
+//             recipient_key: recipient_key.to_string(),
+//             message: message.to_string(),
+//         }
+//     }
+// }
+
+#[derive(Serialize, Deserialize, Debug)]
+#[serde(tag = "@type")]
+pub enum PickupMsgEnum {
+    #[serde(rename = "https://didcomm.org/messagepickup/2.0/status")]
+    PickupStatusMsg(PickupStatusMsg),
+    #[serde(rename = "https://didcomm.org/messagepickup/2.0/status-request")]
+    PickupStatusReqMsg(PickupStatusReqMsg),
+    #[serde(rename = "https://didcomm.org/messagepickup/2.0/delivery-request")]
+    PickupDeliveryReq(PickupDeliveryReqMsg),
+    #[serde(rename = "https://didcomm.org/messagepickup/2.0/delivery")]
+    PickupDelivery(PickupDeliveryMsg),
+    #[serde(rename = "https://didcomm.org/messagepickup/2.0/messages-received")]
+    MessageReceived(MessageReceivedMsg),
+    #[serde(rename = "https://didcomm.org/messagepickup/2.0/live-delivery-change")]
+    LiveDeliveryChange(LiveDeliveryChangeMsg),
+    #[serde(rename = "https://didcomm.org/notification/1.0/problem-report")]
+    ProblemReport(ProblemReportMsg),
+}
+
+#[skip_serializing_none]
+#[derive(Serialize, Deserialize, Debug)]
+pub struct PickupStatusMsg {
+    pub message_count: u32,
+    pub recipient_key: Option<String>,
+}
+
+impl PickupStatusMsg {
+    pub fn new(message_count: u32, recipient_key: Option<String>) -> PickupStatusMsg {
+        PickupStatusMsg {
+            message_count,
+            recipient_key,
+        }
+    }
+}
+
+#[skip_serializing_none]
+#[derive(Serialize, Deserialize, Debug)]
+pub struct PickupStatusReqMsg {
+    #[serde(default)]
+    pub auth_pubkey: String,
+    pub recipient_key: Option<String>,
+}
+
+// impl PickupStatusReqMsg {
+//     pub fn new(recipient_key: Option<String>) -> PickupStatusReqMsg {
+//         PickupStatusReqMsg { recipient_key }
+//     }
+//     // pub fn custom_type(self, _type: String) -> PickupStatusReqMsg {
+//     //     PickupStatusReqMsg {
+//     //          recipient_key: self.recipient_key,
+//     //     }
+//     // }
+// }
+
+#[skip_serializing_none]
+#[derive(Serialize, Deserialize, Debug)]
+pub struct PickupDeliveryReqMsg {
+    #[serde(default)]
+    pub auth_pubkey: String,
+    pub limit: u32,
+    pub recipient_key: Option<String>,
+}
+
+pub mod pickup_delivery_message_structs {
+    use serde_with::{base64::Base64, serde_as};
+
+    use super::{skip_serializing_none, Deserialize, Serialize};
+
+    #[serde_as]
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct PickupDeliveryMsgAttachData {
+        #[serde_as(as = "Base64")]
+        pub base64: Vec<u8>,
+    }
+
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct PickupDeliveryMsgAttach {
+        pub id: String,
+        #[serde(rename = "data")]
+        pub data: PickupDeliveryMsgAttachData,
+    }
+
+    #[skip_serializing_none]
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct PickupDeliveryMsg {
+        pub recipient_key: Option<String>,
+        #[serde(rename = "~attach")]
+        pub attach: Vec<PickupDeliveryMsgAttach>,
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct LiveDeliveryChangeMsg {
+    pub live_delivery: bool,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct ProblemReportMsg {
+    pub description: String,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MessageReceivedMsg {
+    pub message_id_list: Vec<String>,
+}
+
+pub mod mediator_coord_structs {
+    use serde::{Deserialize, Serialize};
+    // use serde_with::skip_serializing_none;
+
+    #[derive(Serialize, Deserialize, Debug)]
+    #[serde(tag = "@type")]
+    pub enum MediatorCoordMsgEnum {
+        #[serde(rename = "https://didcomm.org/coordinate-mediation/1.0/mediate-request")]
+        MediateRequest,
+        #[serde(rename = "https://didcomm.org/coordinate-mediation/1.0/mediate-deny")]
+        MediateDeny(MediateDenyData),
+        #[serde(rename = "https://didcomm.org/coordinate-mediation/1.0/mediate-grant")]
+        MediateGrant(MediateGrantData),
+        #[serde(rename = "https://didcomm.org/coordinate-mediation/1.0/keylist-update")]
+        KeylistUpdateRequest(KeylistUpdateRequestData),
+        #[serde(rename = "https://didcomm.org/coordinate-mediation/1.0/keylist-update-response")]
+        KeylistUpdateResponse(KeylistUpdateResponseData),
+        #[serde(rename = "https://didcomm.org/coordinate-mediation/1.0/keylist-query")]
+        KeylistQuery(KeylistQueryData),
+        #[serde(rename = "https://didcomm.org/coordinate-mediation/1.0/keylist")]
+        Keylist(KeylistData),
+        XumErrorMsg {
+            error: String,
+        },
+    }
+
+    // #[derive(Serialize, Deserialize, Debug)]
+    // pub struct MediateRequestData {
+    //     #[serde(default)]
+    //     pub auth_pubkey: String,
+    //     pub did_doc: String,
+    // }
+
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct MediateDenyData {
+        pub reason: String,
+    }
+
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct MediateGrantData {
+        pub endpoint: String,
+        pub routing_keys: Vec<String>,
+    }
+
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct KeylistUpdateRequestData {
+        pub updates: Vec<KeylistUpdateItem>,
+    }
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct KeylistUpdateResponseData {
+        pub updated: Vec<KeylistUpdateItem>,
+    }
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct KeylistUpdateItem {
+        pub recipient_key: String,
+        pub action: KeylistUpdateItemAction,
+        pub result: Option<KeylistUpdateItemResult>,
+    }
+    #[derive(Serialize, Deserialize, Debug)]
+    pub enum KeylistUpdateItemAction {
+        #[serde(rename = "add")]
+        Add,
+        #[serde(rename = "remove")]
+        Remove,
+    }
+    #[derive(Serialize, Deserialize, Debug)]
+    pub enum KeylistUpdateItemResult {
+        ClientError,
+        ServerError,
+        NoChange,
+        Success,
+    }
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct KeylistQueryData {}
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct KeylistData {
+        pub keys: Vec<KeylistItem>,
+    }
+    #[derive(Serialize, Deserialize, Debug)]
+    pub struct KeylistItem {
+        pub recipient_key: String,
+    }
+}
diff --git a/agents/rust/mediator/mediation/src/lib.rs b/agents/rust/mediator/mediation/src/lib.rs
new file mode 100644
index 0000000000..c3773a0ccc
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/lib.rs
@@ -0,0 +1,9 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod didcomm_types;
+pub mod logging;
+pub mod router;
+pub mod routes;
+pub mod server;
+pub mod storage;
diff --git a/agents/rust/mediator/mediation/src/logging.rs b/agents/rust/mediator/mediation/src/logging.rs
new file mode 100644
index 0000000000..75919650b3
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/logging.rs
@@ -0,0 +1,8 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+use env_logger::Env;
+
+pub fn init_logger() {
+    let env = Env::default().default_filter_or("info");
+    env_logger::init_from_env(env);
+}
diff --git a/agents/rust/mediator/mediation/src/main.rs b/agents/rust/mediator/mediation/src/main.rs
new file mode 100644
index 0000000000..f5d89ebcc6
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/main.rs
@@ -0,0 +1,13 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+use log::info;
+use mediation::{logging, server};
+
+#[tokio::main]
+async fn main() {
+    let _ = dotenvy::dotenv();
+    logging::init_logger();
+    info!("Hello, world!");
+    server::run_server().await;
+}
diff --git a/agents/rust/mediator/mediation/src/router.rs b/agents/rust/mediator/mediation/src/router.rs
new file mode 100644
index 0000000000..6377fc527b
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/router.rs
@@ -0,0 +1,36 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+// use crate::routes::coordination::handle_coord;
+use std::sync::Arc;
+
+use axum::{
+    routing::{get, post},
+    Router,
+};
+
+use crate::{
+    routes::{
+        forward::handle_forward, hello_world, json, json::respond_message_json,
+        pickup::handle_pickup,
+    },
+    storage,
+};
+
+pub async fn create_router() -> Router {
+    // Initialize and get a storage struct that implements MediatorPersistence trait
+    // (this handles connection to storage backend)
+    let storage = storage::get_persistence().await;
+    Router::new()
+        .route(
+            "/",
+            get(hello_world::handle_get).post(hello_world::handle_get),
+        )
+        .route(
+            "/json",
+            get(json::echo_message_json).post(respond_message_json),
+        )
+        .route("/forward", post(handle_forward))
+        .route("/pickup", post(handle_pickup))
+        // .route("/coord", post(handle_coord))
+        .with_state(Arc::new(storage))
+}
diff --git a/agents/rust/mediator/mediation/src/routes/coordination.rs b/agents/rust/mediator/mediation/src/routes/coordination.rs
new file mode 100644
index 0000000000..652d52fdad
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/routes/coordination.rs
@@ -0,0 +1,118 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::sync::Arc;
+
+use axum::{extract::State, Json};
+
+use crate::{
+    didcomm_types::mediator_coord_structs::{MediatorCoordMsgEnum::*, *},
+    storage::MediatorPersistence,
+};
+
+pub async fn handle_coord_authenticated<T: MediatorPersistence>(
+    State(storage): State<Arc<T>>,
+    Json(message): Json<MediatorCoordMsgEnum>,
+    auth_pubkey: &str,
+) -> Json<MediatorCoordMsgEnum> {
+    match message {
+        MediateRequest => {
+            panic!(
+                "Use handle_mediate_request directly. This handler is for preregistered clients."
+            );
+            // handle_mediate_request(
+            //     storage,
+            //     auth_pubkey,
+            //     "{}",
+            //     "",
+            //     MediateGrantData {
+            //         endpoint: "".to_owned(),
+            //         routing_keys: vec![],
+            //     },
+            // )
+            // .await
+        }
+        KeylistUpdateRequest(keylist_update_data) => {
+            handle_keylist_update(storage, keylist_update_data, auth_pubkey).await
+        }
+        KeylistQuery(keylist_query_data) => {
+            handle_keylist_query(storage, keylist_query_data, auth_pubkey).await
+        }
+        _ => handle_unimplemented().await,
+    }
+}
+
+pub async fn handle_unimplemented() -> Json<MediatorCoordMsgEnum> {
+    Json(MediatorCoordMsgEnum::XumErrorMsg {
+        error: "Unimplemented".to_owned(),
+    })
+}
+
+pub async fn handle_mediate_request<T: MediatorPersistence>(
+    storage: Arc<T>,
+    auth_pubkey: &str,
+    did_doc: &str,
+    our_signing_key: &str,
+    grant_data: MediateGrantData,
+) -> Json<MediatorCoordMsgEnum> {
+    match storage
+        .create_account(auth_pubkey, our_signing_key, did_doc)
+        .await
+    {
+        Ok(()) => Json(MediateGrant(grant_data)),
+        Err(msg) => Json(MediateDeny(MediateDenyData { reason: msg })),
+    }
+}
+
+pub async fn handle_keylist_query<T: MediatorPersistence>(
+    storage: Arc<T>,
+    //todo: use the limits mentioned in the KeylistQueryData to modify response
+    _keylist_query_data: KeylistQueryData,
+    auth_pubkey: &str,
+) -> Json<MediatorCoordMsgEnum> {
+    let keylist_items: Vec<KeylistItem> = match storage.list_recipient_keys(auth_pubkey).await {
+        Ok(recipient_keys) => recipient_keys
+            .into_iter()
+            .map(|recipient_key| KeylistItem { recipient_key })
+            .collect(),
+        Err(err) => return Json(MediatorCoordMsgEnum::XumErrorMsg { error: err }),
+    };
+    Json(MediatorCoordMsgEnum::Keylist(KeylistData {
+        keys: keylist_items,
+    }))
+}
+
+pub async fn handle_keylist_update<T: MediatorPersistence>(
+    storage: Arc<T>,
+    keylist_update_data: KeylistUpdateRequestData,
+    auth_pubkey: &str,
+) -> Json<MediatorCoordMsgEnum> {
+    let updates: Vec<KeylistUpdateItem> = keylist_update_data.updates;
+    let mut updated: Vec<KeylistUpdateItem> = Vec::new();
+    for update_item in updates.into_iter() {
+        let result = match &update_item.action {
+            KeylistUpdateItemAction::Add => {
+                storage
+                    .add_recipient(auth_pubkey, &update_item.recipient_key)
+                    .await
+            }
+            KeylistUpdateItemAction::Remove => {
+                storage
+                    .remove_recipient(auth_pubkey, &update_item.recipient_key)
+                    .await
+            }
+        };
+        let update_item_result = match result {
+            Ok(()) => KeylistUpdateItemResult::Success,
+            Err(_msg) => KeylistUpdateItemResult::ServerError,
+        };
+        updated.push(KeylistUpdateItem {
+            recipient_key: update_item.recipient_key,
+            action: update_item.action,
+            result: Some(update_item_result),
+        });
+    }
+    Json(MediatorCoordMsgEnum::KeylistUpdateResponse(
+        KeylistUpdateResponseData { updated },
+    ))
+}
diff --git a/agents/rust/mediator/mediation/src/routes/forward.rs b/agents/rust/mediator/mediation/src/routes/forward.rs
new file mode 100644
index 0000000000..98269a44f9
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/routes/forward.rs
@@ -0,0 +1,24 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::sync::Arc;
+
+use axum::{extract::State, Json};
+use log::{debug, info};
+
+use crate::{didcomm_types::ForwardMsg, storage::MediatorPersistence};
+
+pub async fn handle_forward<T>(
+    State(storage): State<Arc<T>>,
+    Json(forward_msg): Json<ForwardMsg>,
+) -> Json<ForwardMsg>
+where
+    T: MediatorPersistence,
+{
+    info!("Persisting forward message");
+    debug!("{forward_msg:#?}");
+    let _ = storage
+        .persist_forward_message(&forward_msg.recipient_key, &forward_msg.message_data)
+        .await;
+    Json(forward_msg)
+}
diff --git a/agents/rust/mediator/mediation/src/routes/hello_world.rs b/agents/rust/mediator/mediation/src/routes/hello_world.rs
new file mode 100644
index 0000000000..641c09d36f
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/routes/hello_world.rs
@@ -0,0 +1,6 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+pub async fn handle_get() -> String {
+    "hey".to_owned()
+}
diff --git a/agents/rust/mediator/mediation/src/routes/json.rs b/agents/rust/mediator/mediation/src/routes/json.rs
new file mode 100644
index 0000000000..d166d523f9
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/routes/json.rs
@@ -0,0 +1,27 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+use axum::Json;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct MessageJson {
+    message: String,
+}
+
+#[derive(Serialize)]
+pub struct MessageResponseJson {
+    message: String,
+    response: String,
+}
+
+pub async fn echo_message_json(Json(body): Json<MessageJson>) -> Json<MessageJson> {
+    Json(body)
+}
+
+pub async fn respond_message_json(Json(body): Json<MessageJson>) -> Json<MessageResponseJson> {
+    Json(MessageResponseJson {
+        message: (body.message),
+        response: ("I am groot".to_owned()),
+    })
+}
diff --git a/agents/rust/mediator/mediation/src/routes/mod.rs b/agents/rust/mediator/mediation/src/routes/mod.rs
new file mode 100644
index 0000000000..e6da0c5170
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/routes/mod.rs
@@ -0,0 +1,8 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod coordination;
+pub mod forward;
+pub mod hello_world;
+pub mod json;
+pub mod pickup;
diff --git a/agents/rust/mediator/mediation/src/routes/pickup.rs b/agents/rust/mediator/mediation/src/routes/pickup.rs
new file mode 100644
index 0000000000..9e3a70c2bd
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/routes/pickup.rs
@@ -0,0 +1,129 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+use std::sync::Arc;
+
+use axum::{extract::State, http::StatusCode, Json};
+use log::info;
+
+use crate::{
+    didcomm_types::{
+        pickup_delivery_message_structs::*, PickupDeliveryReqMsg, PickupMsgEnum, PickupStatusMsg,
+        PickupStatusReqMsg, ProblemReportMsg,
+    },
+    storage::MediatorPersistence,
+};
+
+pub async fn handle_pickup<T: MediatorPersistence>(
+    State(storage): State<Arc<T>>,
+    Json(pickup_message): Json<PickupMsgEnum>,
+) -> (StatusCode, Json<PickupMsgEnum>) {
+    match &pickup_message {
+        PickupMsgEnum::PickupStatusReqMsg(status_request) => (
+            StatusCode::OK,
+            handle_pickup_status_req(status_request, storage).await,
+        ),
+        // Why is client sending us status? That's server's job.
+        PickupMsgEnum::PickupStatusMsg(_status) => (
+            StatusCode::BAD_REQUEST,
+            handle_pickup_type_not_implemented().await,
+        ),
+        PickupMsgEnum::PickupDeliveryReq(delivery_request) => {
+            handle_pickup_delivery_req(delivery_request, storage).await
+        }
+        _ => {
+            info!("Received {:#?}", &pickup_message);
+            (
+                StatusCode::NOT_IMPLEMENTED,
+                handle_pickup_type_not_implemented().await,
+            )
+        }
+    }
+}
+
+async fn handle_pickup_status_req<T: MediatorPersistence>(
+    status_request: &PickupStatusReqMsg,
+    storage: Arc<T>,
+) -> Json<PickupMsgEnum> {
+    info!("Received {:#?}", &status_request);
+    let auth_pubkey = &status_request.auth_pubkey;
+    let message_count = storage
+        .retrieve_pending_message_count(auth_pubkey, status_request.recipient_key.as_ref())
+        .await
+        .unwrap();
+    let status = PickupStatusMsg {
+        message_count,
+        recipient_key: status_request.recipient_key.to_owned(),
+    };
+    info!("Sending {:#?}", &status);
+    Json(PickupMsgEnum::PickupStatusMsg(status))
+}
+
+async fn handle_pickup_delivery_req<T: MediatorPersistence>(
+    delivery_request: &PickupDeliveryReqMsg,
+    storage: Arc<T>,
+) -> (StatusCode, Json<PickupMsgEnum>) {
+    info!("Received {:#?}", &delivery_request);
+    let auth_pubkey = &delivery_request.auth_pubkey;
+    let messages = storage
+        .retrieve_pending_messages(
+            auth_pubkey,
+            delivery_request.limit,
+            delivery_request.recipient_key.as_ref(),
+        )
+        .await
+        .unwrap();
+    // for (message_id, message_content) in messages.into_iter() {
+    //     info!("Message {:#?} {:#?}", message_id, String::from_utf8(message_content).unwrap())
+    // }
+    let attach: Vec<PickupDeliveryMsgAttach> = messages
+        .into_iter()
+        .map(|(message_id, message_content)| PickupDeliveryMsgAttach {
+            id: message_id,
+            data: PickupDeliveryMsgAttachData {
+                base64: message_content,
+            },
+        })
+        .collect();
+    if !attach.is_empty() {
+        (
+            StatusCode::OK,
+            Json(PickupMsgEnum::PickupDelivery(PickupDeliveryMsg {
+                recipient_key: delivery_request.recipient_key.to_owned(),
+                attach,
+            })),
+        )
+    } else {
+        // send status message instead
+        (
+            StatusCode::OK,
+            Json(PickupMsgEnum::PickupStatusMsg(PickupStatusMsg {
+                message_count: 0,
+                recipient_key: delivery_request.recipient_key.to_owned(),
+            })),
+        )
+    }
+}
+// Returns global status message for user (not restricted to recipient key)
+// async fn handle_pickup_default<T: MediatorPersistence>(
+//     storage: Arc<T>,
+// ) -> Json<PickupMsgEnum> {
+
+//     let message_count = storage
+//         .retrieve_pending_message_count(None)
+//         .await;
+//     let status = PickupStatusMsg {
+//         message_count,
+//         recipient_key: None
+//     };
+//     info!("Sending {:#?}", &status);
+//     Json(PickupMsgEnum::PickupStatusMsg(status))
+// }
+
+async fn handle_pickup_type_not_implemented() -> Json<PickupMsgEnum> {
+    let problem = ProblemReportMsg {
+        description: "This pickup request type not yet implemented.\n Please try again later"
+            .to_owned(),
+    };
+    info!("Sending {:#?}", &problem);
+    Json(PickupMsgEnum::ProblemReport(problem))
+}
diff --git a/agents/rust/mediator/mediation/src/server.rs b/agents/rust/mediator/mediation/src/server.rs
new file mode 100644
index 0000000000..40d8260ff7
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/server.rs
@@ -0,0 +1,16 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+use log::info;
+
+use crate::router::create_router;
+
+pub async fn run_server() {
+    // app definition, and routings
+    let app = create_router().await;
+    info!("Starting server");
+    // add server task to main loop
+    axum::Server::bind(&"127.0.0.1:7999".parse().unwrap())
+        .serve(app.into_make_service())
+        .await
+        .unwrap()
+}
diff --git a/agents/rust/mediator/mediation/src/storage/database/any.rs b/agents/rust/mediator/mediation/src/storage/database/any.rs
new file mode 100644
index 0000000000..613e2fea15
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/storage/database/any.rs
@@ -0,0 +1,81 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+use sqlx::{any::AnyPoolOptions, AnyPool};
+
+/// Gives a connection pool based on DATABASE_URL in the .env file
+/// Could be Postgres (postgres://), Mysql(mysql://) or Sqlite(sqlite://)
+pub async fn get_db_pool() -> AnyPool {
+    let _ = dotenvy::dotenv();
+    let database_url = std::env::var("DATABASE_URL")
+        .expect("Required environment variable DATABASE_URL on command line or in .env!");
+    sqlx::any::install_default_drivers();
+    AnyPoolOptions::new()
+        .connect(&database_url)
+        .await
+        .expect("Failed to connect to database!")
+}
+
+use async_trait::async_trait;
+
+use super::super::MediatorPersistence;
+
+#[cfg(feature = "any_db")]
+#[async_trait]
+impl MediatorPersistence for sqlx::AnyPool {
+    async fn create_account(&self, auth_pubkey: &str) -> Result<(), String> {
+        unimplemented!()
+    }
+    async fn get_account_id(&self, auth_pubkey: &str) -> Result<Vec<u8>, String> {
+        unimplemented!()
+    }
+    // async fn vaporize_account(&self, auth_pubkey: String);
+    async fn add_recipient(&self, auth_pubkey: &str, recipient_key: &str) -> Result<(), String> {
+        unimplemented!()
+    }
+    async fn remove_recipient(&self, auth_pubkey: &str, recipient_key: &str) -> Result<(), String> {
+        unimplemented!()
+    }
+    async fn list_recipient_keys(&self, auth_pubkey: &str) -> Result<Vec<String>, String> {
+        unimplemented!()
+    }
+    async fn persist_forward_message(
+        &self,
+        recipient_key: &str,
+        message_data: &str,
+    ) -> Result<(), String> {
+        unimplemented!()
+    }
+    async fn retrieve_pending_message_count(
+        &self,
+        auth_pubkey: &str,
+        recipient_key: Option<&String>,
+    ) -> Result<u32, String> {
+        unimplemented!()
+    }
+    async fn retrieve_pending_messages(
+        &self,
+        auth_pubkey: &str,
+        limit: u32,
+        recipient_key: Option<&String>,
+    ) -> Result<Vec<(String, Vec<u8>)>, String> {
+        unimplemented!()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::get_db_pool;
+
+    #[tokio::test]
+    pub async fn test_query() {
+        let first_todo_title = "Learn SQLx";
+        let pool = get_db_pool().await;
+
+        sqlx::query("INSERT INTO todos (title) VALUES (?)")
+            .bind(first_todo_title)
+            .execute(&pool)
+            .await
+            .unwrap();
+    }
+}
diff --git a/agents/rust/mediator/mediation/src/storage/database/mod.rs b/agents/rust/mediator/mediation/src/storage/database/mod.rs
new file mode 100644
index 0000000000..4bbde8440e
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/storage/database/mod.rs
@@ -0,0 +1,27 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+// unimplemented!()
+// #[cfg(any(
+//     not(any(feature = "any_db", feature = "postgres_db", feature = "mysql_db")),
+//     all(feature = "any_db", feature = "postgres_db", feature = "mysql_db"),
+//     all(feature = "any_db", feature = "postgres_db"),
+//     all(feature = "postgres_db", feature = "mysql_db"),
+//     all(feature = "any_db", feature = "mysql_db")
+// ))]
+// compile_error!("Pick any one of \"any_db\", \"postgresql_db\", \"mysql_db\" feature flags.");
+
+// #[cfg(feature = "any_db")]
+// mod any;
+// #[cfg(feature = "any_db")]
+// pub use any::get_db_pool;
+
+// #[cfg(feature = "postgres_db")]
+// mod postgres;
+// #[cfg(feature = "postgres_db")]
+// pub use postgres::get_db_pool;
+
+#[cfg(feature = "mysql_db")]
+mod mysql;
+#[cfg(feature = "mysql_db")]
+pub use mysql::get_db_pool;
diff --git a/agents/rust/mediator/mediation/src/storage/database/mysql.rs b/agents/rust/mediator/mediation/src/storage/database/mysql.rs
new file mode 100644
index 0000000000..d22f8614bf
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/storage/database/mysql.rs
@@ -0,0 +1,305 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+use async_trait::async_trait;
+use futures::TryStreamExt;
+use log::info;
+use sqlx::{mysql::MySqlPoolOptions, MySqlPool, Row};
+
+use super::super::MediatorPersistence;
+
+pub async fn get_db_pool() -> MySqlPool {
+    let _ = dotenvy::dotenv();
+    let database_url = std::env::var("MYSQL_URL")
+        .expect("Required environment variable MYSQL_URL on command line or in .env!");
+
+    MySqlPoolOptions::new()
+        .connect(&database_url)
+        .await
+        .expect("Failed to connect to database!")
+}
+
+/// MediatorPersistence trait implementation for MySql Database
+#[async_trait]
+impl MediatorPersistence for sqlx::MySqlPool {
+    async fn create_account(
+        &self,
+        auth_pubkey: &str,
+        our_signing_key: &str,
+        did_doc: &str,
+    ) -> Result<(), String> {
+        info!(
+            "Adding new account to database with auth_pubkey {:#?}",
+            &auth_pubkey
+        );
+        let insert_result = sqlx::query(
+            "INSERT INTO accounts (auth_pubkey, our_signing_key, did_doc) VALUES (?, ?, ?);",
+        )
+        .bind(auth_pubkey)
+        .bind(our_signing_key)
+        .bind(did_doc)
+        .execute(self)
+        .await;
+        if let Err(err) = insert_result {
+            info!("Error during creating new account, {:#?}", err);
+            return Err(format!("{:#}", err));
+        };
+        let account_id = self.get_account_id(auth_pubkey).await?;
+        info!(
+            "Created account {:x?} for auth_pubkey {:#?}",
+            &account_id, &auth_pubkey
+        );
+        Ok(())
+    }
+    /// Get account id associated with auth_pubkey
+    async fn get_account_id(&self, auth_pubkey: &str) -> Result<Vec<u8>, String> {
+        let account_id: Vec<u8> =
+            match sqlx::query("SELECT (account_id) FROM accounts WHERE auth_pubkey = ?;")
+                .bind(auth_pubkey)
+                .fetch_one(self)
+                .await
+            {
+                Ok(account_row) => account_row.get("account_id"),
+                Err(err) => {
+                    info!("Error while finding account, {:#?}", err);
+                    return Err(format!("{:#}", err));
+                }
+            };
+        Ok(account_id)
+    }
+    #[cfg(feature = "mediator_persistence_extras")]
+    async fn list_accounts(&self) -> Result<Vec<(String, String)>, String> {
+        let list: Vec<(String, String)> =
+            sqlx::query("SELECT account_name, auth_pubkey FROM accounts;")
+                .fetch_all(self)
+                .await
+                .map_err(|e| e.to_string())?
+                .iter()
+                .map(|row| (row.get("account_name"), row.get("auth_pubkey")))
+                .collect();
+        Ok(list)
+    }
+    #[cfg(feature = "mediator_persistence_extras")]
+    async fn get_account_details(
+        &self,
+        auth_pubkey: &str,
+    ) -> Result<(u64, String, String, serde_json::Value), String> {
+        let row = sqlx::query("SELECT * FROM accounts WHERE auth_pubkey = ?;")
+            .bind(auth_pubkey)
+            .fetch_one(self)
+            .await
+            .map_err(|e| e.to_string())?;
+        Ok((
+            row.get("seq_num"),
+            row.get("account_name"),
+            row.get("our_signing_key"),
+            row.get::<serde_json::Value, &str>("did_doc"),
+        ))
+    }
+
+    // async fn vaporize_account(&self, auth_pubkey: String) {
+    //     let account: Vec<u8> = self.get_account(auth_pubkey).await?;
+    //     let mut recipient_rows = sqlx::query(
+    //         "SELECT * FROM recipients WHERE account = ?;"
+    //     )
+    //         .bind(&account)
+    //         .fetch(self);
+
+    //     while let Some(recipient_row) = recipient_rows.try_next().await.unwrap() {
+    //         // map the row into a user-defined domain type
+    //         let recipient: Vec<u8> = recipient_row.get("recipient");  // binary decode
+    //         info!("Recipient {:x?}", recipient);
+    //         sqlx::query("DROP (*) FROM messages WHERE recipient = ?;")
+    //         .bind(&recipient)
+    //         .execute(self)
+    //         .await
+    //         .unwrap();
+    //         sqlx::query("DROP (*) FROM recipients WHERE recipient = ?;")
+    //         .bind(&recipient)
+    //         .execute(self)
+    //         .await
+    //         .unwrap();
+
+    //     }
+
+    // }
+    async fn persist_forward_message(
+        &self,
+        recipient_key: &str,
+        message_data: &str,
+    ) -> Result<(), String> {
+        // Fetch recipient with given recipient_key
+        info!("Fetching recipient with recipient_key {:#?}", recipient_key);
+        let recipient_row = sqlx::query("SELECT * FROM recipients WHERE recipient_key = ?")
+            .bind(recipient_key)
+            .fetch_one(self)
+            .await;
+        if let Err(err) = recipient_row {
+            info!("Error while finding target recipient, {:#}", err);
+            return Err(format!("{:#}", err));
+        }
+        let account_id: Vec<u8> = recipient_row.unwrap().get("account_id");
+        // Save message for recipient
+        info!("Persisting message for account {:x?}", account_id);
+        let insert_result = sqlx::query(
+            "INSERT INTO messages (account_id, recipient_key, message_data) VALUES (?, ?, ?)",
+        )
+        .bind(&account_id)
+        .bind(recipient_key)
+        .bind(message_data)
+        .execute(self)
+        .await;
+        if let Err(err) = insert_result {
+            info!(
+                "Error while saving message for recipient {:x?}, {:#}",
+                recipient_key, err
+            );
+            return Err(format!("{:#}", err));
+        }
+        Ok(())
+    }
+    async fn retrieve_pending_message_count(
+        &self,
+        auth_pubkey: &str,
+        recipient_key: Option<&String>,
+    ) -> Result<u32, String> {
+        let account_id: Vec<u8> = self.get_account_id(auth_pubkey).await?;
+        let message_count_result = if let Some(recipient_key) = recipient_key {
+            sqlx::query(
+                "SELECT COUNT(*) FROM messages
+                WHERE (account_id = ?) AND (recipient_key = ?)",
+            )
+            .bind(&account_id)
+            .bind(recipient_key)
+            .fetch_one(self)
+            .await
+        } else {
+            sqlx::query(
+                "SELECT COUNT(*) FROM messages
+                WHERE (account_id = ?)",
+            )
+            .bind(&account_id)
+            .fetch_one(self)
+            .await
+        };
+        // MySQL BIGINT can be converted to i32 only, not u32
+        let message_count: i32 = message_count_result.unwrap().get::<i32, &str>("COUNT(*)");
+        let message_count: u32 = message_count.try_into().unwrap();
+        info!(
+            "Total message count of all requested recipients: {:#?}",
+            &message_count
+        );
+        Ok(message_count)
+    }
+    async fn retrieve_pending_messages(
+        &self,
+        auth_pubkey: &str,
+        limit: u32,
+        recipient_key: Option<&String>,
+    ) -> Result<Vec<(String, Vec<u8>)>, String> {
+        info!(
+            "Processing retrieve for messages to recipient_key {:#?} of auth_pubkey {:#?}",
+            recipient_key, auth_pubkey
+        );
+        let account_id: Vec<u8> = self.get_account_id(auth_pubkey).await?;
+        let mut messages: Vec<(String, Vec<u8>)> = Vec::new();
+        let mut message_rows = if let Some(recipient_key) = recipient_key {
+            sqlx::query("SELECT * FROM messages WHERE (account_id = ?) AND (recipient_key = ?)")
+                .bind(&account_id)
+                .bind(recipient_key)
+                .fetch(self)
+        } else {
+            sqlx::query("SELECT * FROM messages WHERE (account_id = ?)")
+                .bind(&account_id)
+                .fetch(self)
+        };
+        while let Some(message_row) = message_rows.try_next().await.unwrap() {
+            let id: String = message_row.get("message_id");
+            let msg: Vec<u8> = message_row.get("message_data");
+            // debug!("id {:#?}", id);
+            // debug!("recipient {:x?}", recipient);
+            // debug!("message {:x?}", msg);
+            messages.push((id, msg));
+            if u32::try_from(messages.len()).unwrap() >= limit {
+                info!("Found enough messages {:#?}", limit);
+                break;
+            }
+        }
+        info!(
+            "Found total of {:#?} messages, returning them",
+            messages.len()
+        );
+        Ok(messages)
+    }
+    async fn add_recipient(&self, auth_pubkey: &str, recipient_key: &str) -> Result<(), String> {
+        info!(
+            "Adding recipient_key to account with auth_pubkey {:#?}",
+            auth_pubkey
+        );
+        let account_id: Vec<u8> = self.get_account_id(auth_pubkey).await?;
+        info!(
+            "Found matching account {:x?}. Proceeding with attempt to add recipient recipient_key \
+             {:#?} ",
+            account_id, recipient_key
+        );
+        match sqlx::query("INSERT INTO recipients (account_id, recipient_key) VALUES (?, ?);")
+            .bind(&account_id)
+            .bind(recipient_key)
+            .execute(self)
+            .await
+        {
+            Ok(_result) => Ok(()),
+            Err(err) => {
+                info!("Error while adding recipient, {:#}", err);
+                Err(format!("{:#}", err))
+            }
+        }
+    }
+    async fn remove_recipient(&self, auth_pubkey: &str, recipient_key: &str) -> Result<(), String> {
+        info!(
+            "Removing recipient_key from account with auth_pubkey {:#?}",
+            auth_pubkey
+        );
+        let account_id: Vec<u8> = self.get_account_id(auth_pubkey).await?;
+        info!(
+            "Found matching account {:x?}. Proceeding with attempt to remove recipient \
+             recipient_key {:#?} ",
+            account_id, recipient_key
+        );
+        match sqlx::query("DELETE FROM recipients WHERE (account_id = ?) AND (recipient_key = ?);")
+            .bind(&account_id)
+            .bind(recipient_key)
+            .execute(self)
+            .await
+        {
+            Ok(_result) => Ok(()),
+            Err(err) => {
+                info!("Error while removing recipient, {:#}", err);
+                Err(format!("{:#}", err))
+            }
+        }
+    }
+    async fn list_recipient_keys(&self, auth_pubkey: &str) -> Result<Vec<String>, String> {
+        info!(
+            "Retrieving recipient_keys for account with auth_pubkey {:#?}",
+            auth_pubkey
+        );
+        let account_id: Vec<u8> = self.get_account_id(auth_pubkey).await?;
+        let recipient_keys: Vec<String> =
+            match sqlx::query("SELECT (recipient_key) FROM recipients WHERE account_id = ?;")
+                .bind(&account_id)
+                .fetch_all(self)
+                .await
+            {
+                Ok(recipient_key_rows) => recipient_key_rows
+                    .into_iter()
+                    .map(|row| row.get("recipient_key"))
+                    .collect(),
+                Err(err) => {
+                    info!("Error while getting recipient_keys, {:#}", err);
+                    return Err(format!("{:#}", err));
+                }
+            };
+        Ok(recipient_keys)
+    }
+}
diff --git a/agents/rust/mediator/mediation/src/storage/database/postgres.rs b/agents/rust/mediator/mediation/src/storage/database/postgres.rs
new file mode 100644
index 0000000000..1a0fa46257
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/storage/database/postgres.rs
@@ -0,0 +1,86 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+use sqlx::{postgres::PgPoolOptions, PgPool};
+
+pub async fn get_db_pool() -> PgPool {
+    let _ = dotenvy::dotenv();
+    let database_url: String = std::env::var("POSTGRES_URL")
+        .expect("Required environment variable POSTGRES_URL on command line or in .env!");
+
+    PgPoolOptions::new()
+        .connect(&database_url)
+        .await
+        .expect("Failed to connect to database!")
+}
+
+use async_trait::async_trait;
+
+use super::super::MediatorPersistence;
+
+#[cfg(feature = "postgres_db")]
+#[async_trait]
+impl MediatorPersistence for sqlx::AnyPool {
+    async fn create_account(&self, auth_pubkey: &str) -> Result<(), String> {
+        unimplemented!()
+    }
+    async fn get_account_id(&self, auth_pubkey: &str) -> Result<Vec<u8>, String> {
+        unimplemented!()
+    }
+    // async fn vaporize_account(&self, auth_pubkey: String);
+    async fn add_recipient(&self, auth_pubkey: &str, recipient_key: &str) -> Result<(), String> {
+        unimplemented!()
+    }
+    async fn remove_recipient(&self, auth_pubkey: &str, recipient_key: &str) -> Result<(), String> {
+        unimplemented!()
+    }
+    async fn list_recipient_keys(&self, auth_pubkey: &str) -> Result<Vec<String>, String> {
+        unimplemented!()
+    }
+    async fn persist_forward_message(
+        &self,
+        recipient_key: &str,
+        message_data: &str,
+    ) -> Result<(), String> {
+        unimplemented!()
+    }
+    async fn retrieve_pending_message_count(
+        &self,
+        auth_pubkey: &str,
+        recipient_key: Option<&String>,
+    ) -> Result<u32, String> {
+        unimplemented!()
+    }
+    async fn retrieve_pending_messages(
+        &self,
+        auth_pubkey: &str,
+        limit: u32,
+        recipient_key: Option<&String>,
+    ) -> Result<Vec<(String, Vec<u8>)>, String> {
+        unimplemented!()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::get_db_pool;
+
+    #[test]
+    fn it_works() {
+        let result = 2 + 2;
+        assert_eq!(result, 4);
+    }
+
+    #[tokio::test]
+    #[ignore]
+    pub async fn test_query() {
+        let first_todo_title = "Learn SQLx";
+        let pool = get_db_pool().await;
+
+        sqlx::query("INSERT INTO todos (title) VALUES ($1)")
+            .bind(first_todo_title)
+            .execute(&pool)
+            .await
+            .unwrap();
+    }
+}
diff --git a/agents/rust/mediator/mediation/src/storage/mod.rs b/agents/rust/mediator/mediation/src/storage/mod.rs
new file mode 100644
index 0000000000..e3a72e9f01
--- /dev/null
+++ b/agents/rust/mediator/mediation/src/storage/mod.rs
@@ -0,0 +1,48 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod database;
+use async_trait::async_trait;
+/// Database backend is used for default implementation of MediatorPersistence trait
+pub use database::get_db_pool as get_persistence;
+
+#[async_trait]
+pub trait MediatorPersistence: Send + Sync + 'static {
+    async fn create_account(
+        &self,
+        auth_pubkey: &str,
+        our_signing_key: &str,
+        did_doc: &str,
+    ) -> Result<(), String>;
+    async fn get_account_id(&self, auth_pubkey: &str) -> Result<Vec<u8>, String>;
+    // async fn vaporize_account(&self, auth_pubkey: String);
+    async fn add_recipient(&self, auth_pubkey: &str, recipient_key: &str) -> Result<(), String>;
+    async fn remove_recipient(&self, auth_pubkey: &str, recipient_key: &str) -> Result<(), String>;
+    async fn list_recipient_keys(&self, auth_pubkey: &str) -> Result<Vec<String>, String>;
+    async fn persist_forward_message(
+        &self,
+        recipient_key: &str,
+        message_data: &str,
+    ) -> Result<(), String>;
+    async fn retrieve_pending_message_count(
+        &self,
+        auth_pubkey: &str,
+        recipient_key: Option<&String>,
+    ) -> Result<u32, String>;
+    async fn retrieve_pending_messages(
+        &self,
+        auth_pubkey: &str,
+        limit: u32,
+        recipient_key: Option<&String>,
+    ) -> Result<Vec<(String, Vec<u8>)>, String>;
+    // async fn mark_messages_received(&self, message_id: Vec<u32>);
+    #[cfg(feature = "mediator_persistence_extras")]
+    /// Returns vector of (account_name, auth_pubkey)
+    async fn list_accounts(&self) -> Result<Vec<(String, String)>, String>;
+    #[cfg(feature = "mediator_persistence_extras")]
+    /// Returns account details (sr.no, account_name, our_signing_key, did_doc)
+    async fn get_account_details(
+        &self,
+        auth_pubkey: &str,
+    ) -> Result<(u64, String, String, serde_json::Value), String>;
+}
diff --git a/agents/rust/mediator/mediation/tests/e2e-hello-test.rs b/agents/rust/mediator/mediation/tests/e2e-hello-test.rs
new file mode 100644
index 0000000000..31f274065e
--- /dev/null
+++ b/agents/rust/mediator/mediation/tests/e2e-hello-test.rs
@@ -0,0 +1,57 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+use reqwest::Error;
+use serde::{Deserialize, Serialize};
+
+const BASE_URL: &str = "http://localhost:7999";
+
+#[test]
+fn test_base_path_returns_hey() -> Result<(), Error> {
+    let client = reqwest::blocking::Client::new();
+    let res = client.get(BASE_URL.to_owned()).send()?;
+
+    match res.error_for_status() {
+        Ok(res) => {
+            let res_text = res.text()?;
+            assert_eq!("hey", res_text, "Unexpected response text");
+            Ok(())
+        }
+        Err(err) => Err(err),
+    }
+}
+
+#[test]
+fn test_json_path_returns_groot() -> Result<(), Error> {
+    let client = reqwest::blocking::Client::new();
+
+    #[derive(Serialize)]
+    struct ReqMsg {
+        message: String,
+    }
+    #[derive(Deserialize, Debug)]
+    struct ResMsg {
+        message: String,
+        response: String,
+    }
+    let endpoint = format!("{BASE_URL}/json");
+    let req_msg = ReqMsg {
+        message: "Hello Axum".to_owned(),
+    };
+    let res = client.post(endpoint).json(&req_msg).send()?;
+    // match res.error_for_status_ref() {
+    //     Ok(_) => (),
+    //     Err(err) => {
+    //         return Err(err);
+    //     }
+    // }
+    res.error_for_status_ref()?;
+
+    let res_json: ResMsg = res.json::<ResMsg>()?;
+    assert_eq!(&req_msg.message, &res_json.message, "Mispronounced echo");
+    assert_eq!(
+        "I am groot", &res_json.response,
+        "Server did not groot! Expected groot."
+    );
+    Ok(())
+}
diff --git a/agents/rust/mediator/mediation/tests/e2e-persistence.rs b/agents/rust/mediator/mediation/tests/e2e-persistence.rs
new file mode 100644
index 0000000000..40d4098151
--- /dev/null
+++ b/agents/rust/mediator/mediation/tests/e2e-persistence.rs
@@ -0,0 +1,74 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::sync::Once;
+
+use serde_json::json;
+static INIT: Once = Once::new();
+
+const BASE_URL: &str = "http://localhost:7999";
+
+// Test variables
+const AUTH_PUBKEY: &str = "Anderson Smith n0r3t1";
+const RECIPIENT_KEY: &str = "Anderson Smith n0r3t1r1";
+const DID_DOC: &str = "{}";
+
+fn setup_account() {
+    let client = reqwest::blocking::Client::new();
+    let endpoint = format!("{BASE_URL}/coord");
+    let new_account_req = json!(
+        {
+            "@type": "https://didcomm.org/coordinate-mediation/1.0/mediate-request",
+            "auth_pubkey": AUTH_PUBKEY,
+            "did_doc": DID_DOC
+        }
+    );
+    let res = client.post(endpoint).json(&new_account_req).send().unwrap();
+    res.error_for_status().unwrap();
+}
+fn setup_recipient() {
+    let client = reqwest::blocking::Client::new();
+    let endpoint = format!("{BASE_URL}/coord");
+    let add_recipient_req = json!(
+        {
+            "@type": "https://didcomm.org/coordinate-mediation/1.0/keylist-update",
+            "auth_pubkey": AUTH_PUBKEY,
+            "updates": [
+              {
+                "recipient_key": RECIPIENT_KEY,
+                "action": "add"
+              }
+            ]
+          }
+    );
+    let res = client
+        .post(endpoint)
+        .json(&add_recipient_req)
+        .send()
+        .unwrap();
+    res.error_for_status().unwrap();
+}
+pub fn initialize() {
+    INIT.call_once(|| {
+        setup_account();
+        setup_recipient();
+    });
+}
+
+// #[ignore]
+#[test]
+fn test_forward_message() {
+    initialize();
+    let client = reqwest::blocking::Client::new();
+    let endpoint = format!("{BASE_URL}/forward");
+    let forward_message = json!(
+        {
+            "@type" : "https://didcomm.org/routing/1.0/forward",
+            "@id": "54ad1a63-29bd-4a59-abed-1c5b1026e6fd",
+            "to"   : RECIPIENT_KEY,
+            "msg"  : "<super secret packed DIDCOMM message>"
+        }
+    );
+    let res = client.post(endpoint).json(&forward_message).send().unwrap();
+    res.error_for_status().unwrap();
+}
diff --git a/agents/rust/mediator/mediation/tests/e2e-pickup.rs b/agents/rust/mediator/mediation/tests/e2e-pickup.rs
new file mode 100644
index 0000000000..0814be81f7
--- /dev/null
+++ b/agents/rust/mediator/mediation/tests/e2e-pickup.rs
@@ -0,0 +1,249 @@
+// Copyright 2023 Naian G.
+// SPDX-License-Identifier: Apache-2.0
+
+use std::sync::Once;
+
+use env_logger::Env;
+use log::warn;
+use serde_json::json;
+static INIT: Once = Once::new();
+const BASE_URL: &str = "http://localhost:7999";
+
+// Test variables
+const AUTH_PUBKEY: &str = "Anderson Smith n0r3t1";
+const RECIPIENT_KEY: &str = "Anderson Smith n0r3t1r1";
+const DID_DOC: &str = "{}";
+
+fn setup_logging() {
+    let env = Env::default().default_filter_or("info");
+    env_logger::init_from_env(env);
+}
+fn setup_account() {
+    let client = reqwest::blocking::Client::new();
+    let endpoint = format!("{BASE_URL}/coord");
+    let new_account_req = json!(
+        {
+            "@type": "https://didcomm.org/coordinate-mediation/1.0/mediate-request",
+            "auth_pubkey": AUTH_PUBKEY,
+            "did_doc": DID_DOC
+        }
+    );
+    let res = client.post(endpoint).json(&new_account_req).send().unwrap();
+    res.error_for_status().unwrap();
+}
+fn setup_recipient() {
+    let client = reqwest::blocking::Client::new();
+    let endpoint = format!("{BASE_URL}/coord");
+    let add_recipient_req = json!(
+        {
+            "@type": "https://didcomm.org/coordinate-mediation/1.0/keylist-update",
+            "auth_pubkey": AUTH_PUBKEY,
+            "updates": [
+              {
+                "recipient_key": RECIPIENT_KEY,
+                "action": "add"
+              }
+            ]
+          }
+    );
+    let res = client
+        .post(endpoint)
+        .json(&add_recipient_req)
+        .send()
+        .unwrap();
+    res.error_for_status().unwrap();
+}
+
+fn initialize() {
+    INIT.call_once(|| {
+        setup_logging();
+        setup_account();
+        setup_recipient();
+    });
+}
+
+#[test]
+fn test_status_request_endpoint_exists() {
+    initialize();
+    let client = reqwest::blocking::Client::new();
+    let endpoint = format!("{BASE_URL}/pickup");
+
+    let (id, recipient_key) = (123, RECIPIENT_KEY);
+    let status_request = json!(
+        {
+            "@id": id,
+            "@type": "https://didcomm.org/messagepickup/2.0/status-request",
+            "auth_pubkey": AUTH_PUBKEY,
+            "recipient_key": recipient_key
+        }
+    );
+    let res = client.post(endpoint).json(&status_request).send().unwrap();
+    res.error_for_status().unwrap();
+}
+
+#[test]
+fn test_status_request_returns_a_valid_status() {
+    initialize();
+    let client = reqwest::blocking::Client::new();
+    let endpoint = format!("{BASE_URL}/pickup");
+
+    let status_request = json!(
+        {
+            "@id": 123,
+            "@type": "https://didcomm.org/messagepickup/2.0/status-request",
+            "auth_pubkey": AUTH_PUBKEY,
+        }
+    );
+    let res = client.post(endpoint).json(&status_request).send().unwrap();
+    let res_msg = res.json::<serde_json::Value>().unwrap();
+    assert_eq!(
+        "https://didcomm.org/messagepickup/2.0/status",
+        res_msg["@type"]
+    );
+    assert!(res_msg.get("message_count").is_some());
+}
+
+#[test]
+fn test_status_request_for_key_returns_a_valid_status() {
+    initialize();
+    let client = reqwest::blocking::Client::new();
+    let endpoint = format!("{BASE_URL}/pickup");
+
+    let status_request = json!(
+        {
+            "@id": 123,
+            "@type": "https://didcomm.org/messagepickup/2.0/status-request",
+            "auth_pubkey": AUTH_PUBKEY,
+            "recipient_key": RECIPIENT_KEY
+        }
+    );
+    let res = client.post(endpoint).json(&status_request).send().unwrap();
+    let res_msg = res.json::<serde_json::Value>().unwrap();
+    assert_eq!(
+        "https://didcomm.org/messagepickup/2.0/status",
+        res_msg["@type"]
+    );
+    assert!(res_msg.get("message_count").is_some());
+    assert_eq!(RECIPIENT_KEY, res_msg["recipient_key"]);
+}
+
+// {
+//     "@id": "123456781",
+//     "@type": "https://didcomm.org/messagepickup/2.0/status",
+//     "recipient_key": "<key for messages>",
+//     "message_count": 7,
+//     "longest_waited_seconds": 3600,
+//     "newest_received_time": "2019-05-01 12:00:00Z",
+//     "oldest_received_time": "2019-05-01 12:00:01Z",
+//     "total_bytes": 8096,
+//     "live_delivery": false
+// }
+
+#[test]
+fn test_delivery_request_returns_status_when_queue_empty() {
+    initialize();
+    let client = reqwest::blocking::Client::new();
+    let endpoint = format!("{BASE_URL}/pickup");
+    // Use non existing recipient key to test 0 waiting messages case
+    let delivery_req = json!(
+        {
+            "@id": "123456781",
+            "@type": "https://didcomm.org/messagepickup/2.0/delivery-request",
+            "auth_pubkey": AUTH_PUBKEY,
+
+            "limit": 10,
+            "recipient_key": "<key for messages>"
+        }
+    );
+
+    let res = client.post(endpoint).json(&delivery_req).send().unwrap();
+    if let Err(err) = res.error_for_status_ref() {
+        warn!("Error response status {:#?}", err);
+    }
+    let res_msg = res.json::<serde_json::Value>().unwrap();
+    assert_eq!(
+        "https://didcomm.org/messagepickup/2.0/status",
+        res_msg["@type"]
+    );
+    assert_eq!(0, res_msg["message_count"]);
+}
+
+#[test]
+fn test_delivery_request() {
+    initialize();
+    let client = reqwest::blocking::Client::new();
+    let endpoint = format!("{BASE_URL}/pickup");
+    let delivery_request = json!(
+        {
+            "@id": 123,
+            "@type": "https://didcomm.org/messagepickup/2.0/delivery-request",
+            "auth_pubkey": AUTH_PUBKEY,
+            "limit": 10
+        }
+    );
+    let res = client
+        .post(endpoint)
+        .json(&delivery_request)
+        .send()
+        .unwrap();
+    if let Err(err) = res.error_for_status_ref() {
+        warn!("Error response status {:#?}", err);
+    }
+    let res_msg = res.json::<serde_json::Value>().unwrap();
+    assert_eq!(
+        "https://didcomm.org/messagepickup/2.0/delivery",
+        res_msg["@type"]
+    );
+    // assert_ne!(0, res_msg["message_count"]);
+}
+// {
+//     "@id": "123456781",
+//     "@type": "https://didcomm.org/messagepickup/2.0/delivery-request",
+//     "limit": 10,
+//     "recipient_key": "<key for messages>"
+// }
+
+// {
+//     "@type": "https://didcomm.org/messagepickup/2.0/delivery-request",
+//     "limit": 1
+// }
+
+// {
+//     "@id": "123456781",
+//     "~thread": {
+//         "thid": "<message id of delivery-request message>"
+//       },
+//     "@type": "https://didcomm.org/messagepickup/2.0/delivery",
+//     "recipient_key": "<key for messages>",
+//     "~attach": [{
+//     	"@id": "<messageid>",
+//     	"data": {
+//     		"base64": ""
+//     	}
+//     }]
+// }
+
+// {
+//     "@type": "https://didcomm.org/messagepickup/2.0/messages-received",
+//     "message_id_list": ["123","456"]
+// }
+
+// Multiple Recipients
+
+// // If a message arrives at a Mediator addressed to multiple Recipients,
+// // the message MUST be queued for each Recipient independently.
+// // If one of the addressed Recipients retrieves a message and indicates it has been received,
+// // that message MUST still be held and then removed by the other addressed Recipients.
+
+// {
+//     "@type": "https://didcomm.org/messagepickup/2.0/live-delivery-change",
+//     "live_delivery": true
+// }
+
+// {
+//     "@type": "https://didcomm.org/notification/1.0/problem-report",
+//     "~thread": {
+//       "pthid": "<message id of offending live_delivery_change>"
+//     },
+//     "description": "Connection does not support Live Delivery"
+// }
diff --git a/agents/rust/mediator/src/aries_agent/client.rs b/agents/rust/mediator/src/aries_agent/client.rs
new file mode 100644
index 0000000000..8f0d2e7743
--- /dev/null
+++ b/agents/rust/mediator/src/aries_agent/client.rs
@@ -0,0 +1,148 @@
+use aries_vcx::{
+    handlers::util::AnyInvitation,
+    protocols::{
+        connection::invitee::{
+            states::{
+                completed::Completed, initial::Initial as ClientInit,
+                requested::Requested as ClientRequestSent,
+            },
+            InviteeConnection,
+        },
+        mediated_connection::pairwise_info::PairwiseInfo,
+    },
+    utils::{encryption_envelope::EncryptionEnvelope, mockdata::profile::mock_ledger::MockLedger},
+};
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
+use mediation::storage::MediatorPersistence;
+use messages::{
+    msg_fields::protocols::{
+        connection::{response::Response, Connection},
+        out_of_band::invitation::Invitation as OOBInvitation,
+    },
+    AriesMessage,
+};
+
+use super::{transports::AriesTransport, Agent};
+use crate::{aries_agent::utils::oob2did, utils::prelude::*};
+
+// client role utilities
+impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
+    /// Starting from a new connection object, tries to create connection request object for the
+    /// specified OOB invite endpoint
+    pub async fn gen_connection_request(
+        &self,
+        oob_invite: OOBInvitation,
+    ) -> Result<(InviteeConnection<ClientRequestSent>, EncryptionEnvelope), String> {
+        // Generate keys
+        let (pw_did, pw_vk) = self
+            .wallet
+            .create_and_store_my_did(None, None)
+            .await
+            .unwrap();
+        // Create fresh connection object and transform step wise to requested state
+        let mock_ledger = MockLedger {}; // not good. to be dealt later
+        let client_conn = InviteeConnection::<ClientInit>::new_invitee(
+            "foo".into(),
+            PairwiseInfo { pw_did, pw_vk },
+        )
+        .accept_invitation(&mock_ledger, AnyInvitation::Oob(oob_invite.clone()))
+        .await
+        .unwrap();
+        let client_conn = client_conn
+            .prepare_request("http://response.http.alt".parse().unwrap(), vec![])
+            .await
+            .unwrap();
+        // Extract the actual connection request message to be sent
+        let msg_connection_request = client_conn.get_request().clone();
+        info!("Client Connection Request: {:#?}", msg_connection_request);
+        let req_msg = client_conn.get_request();
+        debug!(
+            "Connection Request: {},",
+            serde_json::to_string_pretty(&req_msg).unwrap()
+        );
+        // encrypt/pack the connection request message
+        let EncryptionEnvelope(packed_aries_msg_bytes) = client_conn
+            .encrypt_message(
+                self.wallet.as_ref(),
+                &AriesMessage::Connection(Connection::Request(req_msg.clone())),
+            )
+            .await
+            .unwrap();
+
+        Ok((client_conn, EncryptionEnvelope(packed_aries_msg_bytes)))
+    }
+
+    pub async fn handle_connection_response(
+        &self,
+        state: InviteeConnection<ClientRequestSent>,
+        response: Response,
+    ) -> Result<InviteeConnection<Completed>, String> {
+        state
+            .handle_response(self.wallet.as_ref(), response)
+            .await
+            .map_err(|err| err.to_string())
+    }
+    pub async fn save_completed_connection_as_contact(
+        &self,
+        state: &InviteeConnection<Completed>,
+    ) -> Result<(), String> {
+        let their_vk = state.remote_vk().map_err(|e| e.to_string())?;
+        let our_vk = &state.pairwise_info().pw_vk;
+        self.create_account(&their_vk, our_vk, state.their_did_doc())
+            .await?;
+        Ok(())
+    }
+
+    pub async fn list_contacts(&self) -> Result<Vec<(String, String)>, String> {
+        self.persistence.list_accounts().await
+    }
+    /// Workflow method to establish DidComm connection with Aries peer, given OOB invite.
+    pub async fn establish_connection(
+        &self,
+        oob_invite: OOBInvitation,
+        aries_transport: &mut impl AriesTransport,
+    ) -> Result<InviteeConnection<Completed>, anyhow::Error> {
+        let (state, EncryptionEnvelope(packed_aries_msg_bytes)) = self
+            .gen_connection_request(oob_invite.clone())
+            .await
+            .map_err(|err| GenericStringError { msg: err })?;
+        let packed_aries_msg_json = serde_json::from_slice(&packed_aries_msg_bytes)?;
+        info!(
+            "Sending Connection Request Envelope: {},",
+            serde_json::to_string_pretty(&packed_aries_msg_json).unwrap()
+        );
+        aries_transport
+            .push_aries_envelope(packed_aries_msg_json, &oob2did(oob_invite))
+            .await?;
+        let response_envelope = aries_transport.pop_aries_envelope()?;
+        info!(
+            "Received Response envelope {:#?}, unpacking",
+            serde_json::to_string_pretty(&response_envelope).unwrap()
+        );
+        let response_envelope_bytes = serde_json::to_vec(&response_envelope)?;
+        let response_unpacked = self
+            .unpack_didcomm(&response_envelope_bytes)
+            .await
+            .map_err(|err| GenericStringError { msg: err })?;
+        let response_message: AriesMessage = serde_json::from_str(&response_unpacked.message)?;
+        let AriesMessage::Connection(Connection::Response(connection_response)) = response_message
+        else {
+            return Err(GenericStringError {
+                msg: format!("Expected connection response, got {:?}", response_message),
+            }
+            .into());
+        };
+        let state = self
+            .handle_connection_response(state, connection_response)
+            .await
+            .map_err(|err| GenericStringError { msg: err })?;
+        info!(
+            "Completed Connection {:?}, saving as contact",
+            serde_json::to_value(&state).unwrap()
+        );
+        self.save_completed_connection_as_contact(&state)
+            .await
+            .map_err(|err| GenericStringError { msg: err })?;
+        Ok(state)
+    }
+}
diff --git a/agents/rust/mediator/src/aries_agent/mod.rs b/agents/rust/mediator/src/aries_agent/mod.rs
new file mode 100644
index 0000000000..0c8976d9ab
--- /dev/null
+++ b/agents/rust/mediator/src/aries_agent/mod.rs
@@ -0,0 +1,284 @@
+use std::{marker::PhantomData, sync::Arc};
+
+use aries_vcx::{
+    handlers::out_of_band::sender::OutOfBandSender,
+    messages::msg_fields::protocols::out_of_band::invitation::OobService,
+    utils::encryption_envelope::EncryptionEnvelope,
+};
+use aries_vcx_core::{
+    errors::error::AriesVcxCoreError,
+    wallet::{
+        base_wallet::BaseWallet,
+        indy::{wallet::create_and_open_wallet, IndySdkWallet, WalletConfig},
+        structs_io::UnpackMessageOutput,
+    },
+    WalletHandle,
+};
+use diddoc_legacy::aries::{diddoc::AriesDidDoc, service::AriesService};
+use mediation::storage::{get_persistence, MediatorPersistence};
+use messages::{
+    msg_fields::protocols::{
+        connection::{request::Request, response::Response, Connection},
+        out_of_band::invitation::Invitation as OOBInvitation,
+    },
+    AriesMessage,
+};
+use serde_json::json;
+
+use self::transports::AriesTransport;
+use crate::utils::{prelude::*, structs::VeriKey};
+
+#[cfg(any(test, feature = "client"))]
+pub mod client;
+pub mod transports;
+pub mod utils;
+
+#[derive(Clone)]
+pub struct Agent<T: BaseWallet, P: MediatorPersistence> {
+    wallet: Arc<T>,
+    persistence: Arc<P>,
+    service: Option<AriesService>,
+}
+
+pub type ArcAgent<T, P> = Arc<Agent<T, P>>;
+
+pub struct AgentBuilder<T: BaseWallet> {
+    _type_wallet: PhantomData<T>,
+}
+/// Constructors
+impl AgentBuilder<IndySdkWallet> {
+    pub async fn new_from_wallet_config(
+        config: WalletConfig,
+    ) -> Result<Agent<IndySdkWallet, sqlx::MySqlPool>, AriesVcxCoreError> {
+        let wallet_handle: WalletHandle = create_and_open_wallet(&config).await?;
+        let wallet = Arc::new(IndySdkWallet::new(wallet_handle));
+        info!("Connecting to persistence layer");
+        let persistence = Arc::new(get_persistence().await);
+        Ok(Agent {
+            wallet,
+            persistence,
+            service: None,
+        })
+    }
+    pub async fn new_demo_agent() -> Result<Agent<IndySdkWallet, sqlx::MySqlPool>, AriesVcxCoreError>
+    {
+        let config = WalletConfig {
+            wallet_name: uuid::Uuid::new_v4().to_string(),
+            wallet_key: "8dvfYSt5d1taSd6yJdpjq4emkwsPDDLYxkNFysFD2cZY".into(),
+            wallet_key_derivation: "RAW".into(),
+            wallet_type: None,
+            storage_config: None,
+            storage_credentials: None,
+            rekey: None,
+            rekey_derivation_method: None,
+        };
+        Self::new_from_wallet_config(config).await
+    }
+}
+
+// Utils
+impl<T: BaseWallet + 'static, P: MediatorPersistence> Agent<T, P> {
+    pub fn get_wallet_ref(&self) -> Arc<dyn BaseWallet> {
+        self.wallet.clone()
+    }
+    pub fn get_persistence_ref(&self) -> Arc<impl MediatorPersistence> {
+        self.persistence.clone()
+    }
+    pub fn get_service_ref(&self) -> Option<&AriesService> {
+        self.service.as_ref()
+    }
+    pub async fn reset_service(
+        &mut self,
+        routing_keys: Vec<String>,
+        service_endpoint: url::Url,
+    ) -> Result<(), AriesVcxCoreError> {
+        let (_, vk) = self.wallet.create_and_store_my_did(None, None).await?;
+        let service = AriesService {
+            id: "#inline".to_owned(),
+            type_: "did-communication".to_owned(),
+            priority: 0,
+            recipient_keys: vec![vk],
+            routing_keys,
+            service_endpoint,
+        };
+        self.service = Some(service);
+        Ok(())
+    }
+
+    pub async fn init_service(
+        &mut self,
+        routing_keys: Vec<String>,
+        service_endpoint: url::Url,
+    ) -> Result<(), AriesVcxCoreError> {
+        self.reset_service(routing_keys, service_endpoint).await
+    }
+    pub fn get_oob_invite(&self) -> Result<OOBInvitation, String> {
+        if let Some(service) = &self.service {
+            let invitation = OutOfBandSender::create()
+                .append_service(&OobService::AriesService(service.clone()))
+                .oob
+                .clone();
+            Ok(invitation)
+        } else {
+            Err("No service to create invite for".to_owned())
+        }
+    }
+    pub async fn unpack_didcomm(&self, didcomm_msg: &[u8]) -> Result<UnpackMessageOutput, String> {
+        let unpacked = self
+            .wallet
+            .unpack_message(didcomm_msg)
+            .await
+            .expect("Valid didcomm?");
+        info!("{:#?}", unpacked);
+        Ok(unpacked)
+    }
+
+    pub async fn pack_didcomm(
+        &self,
+        message: &[u8],
+        our_vk: &VeriKey,
+        their_diddoc: &AriesDidDoc,
+    ) -> Result<EncryptionEnvelope, String> {
+        EncryptionEnvelope::create(self.wallet.as_ref(), message, Some(our_vk), their_diddoc)
+            .await
+            .map_err(string_from_std_error)
+    }
+    pub async fn pack_and_send_didcomm(
+        &self,
+        message: &[u8],
+        our_vk: &VeriKey,
+        their_diddoc: &AriesDidDoc,
+        aries_transport: &mut impl AriesTransport,
+    ) -> Result<(), String> {
+        let EncryptionEnvelope(packed_message) =
+            self.pack_didcomm(message, our_vk, their_diddoc).await?;
+        let packed_json = serde_json::from_slice(&packed_message).map_err(string_from_std_error)?;
+        info!(
+            "Packed: {:?}, sending",
+            serde_json::to_string(&packed_json).unwrap()
+        );
+        aries_transport
+            .push_aries_envelope(packed_json, their_diddoc)
+            .await
+            .map_err(string_from_std_error)
+    }
+
+    // pub async fn pack_message(&self, message: AriesMessage, recipient_vk: VeriKey, sender_vk:
+    // VeriKey) -> Value {     todo!()
+    // }
+    /// Returns account details (account_name, our_signing_key, did_doc)
+    pub async fn auth_and_get_details(
+        &self,
+        sender_verkey: &Option<VeriKey>,
+    ) -> Result<(String, VeriKey, AriesDidDoc), String> {
+        let auth_pubkey = sender_verkey
+            .as_deref()
+            .ok_or("Anonymous sender can't be authenticated")?;
+        let (_sr_no, account_name, our_signing_key, did_doc_json) =
+            self.persistence.get_account_details(auth_pubkey).await?;
+        let diddoc =
+            serde_json::from_value::<AriesDidDoc>(did_doc_json).map_err(string_from_std_error)?;
+        Ok((account_name, our_signing_key, diddoc))
+    }
+    pub async fn handle_connection_req(
+        &self,
+        request: Request,
+    ) -> Result<EncryptionEnvelope, String> {
+        if let Err(err) = request.content.connection.did_doc.validate() {
+            return Err(format!("Request DidDoc validation failed! {:?}", err));
+        }
+
+        let thread_id = request
+            .decorators
+            .thread
+            .map(|t| t.thid)
+            .unwrap_or(request.id);
+        let (did, vk) = self
+            .wallet
+            .create_and_store_my_did(None, None)
+            .await
+            .map_err(|e| e.to_string())?;
+        let old_vk = self
+            .service
+            .as_ref()
+            .unwrap()
+            .recipient_keys
+            .first()
+            .unwrap()
+            .to_owned();
+
+        let response: Response = utils::build_response_content(
+            self.wallet.as_ref(),
+            thread_id,
+            old_vk.clone(),
+            did,
+            vk.clone(),
+            self.service.as_ref().unwrap().service_endpoint.clone(),
+            self.service.as_ref().unwrap().routing_keys.clone(),
+        )
+        .await
+        .map_err(|e| e.to_string())?;
+        let aries_response = AriesMessage::Connection(Connection::Response(response));
+        let their_diddoc = request.content.connection.did_doc;
+        let packed_response_envelope = EncryptionEnvelope::create(
+            self.wallet.as_ref(),
+            json!(aries_response).to_string().as_bytes(),
+            Some(&old_vk),
+            &their_diddoc,
+        )
+        .await
+        .map_err(|e| e.to_string())?;
+        let their_keys = their_diddoc.recipient_keys().map_err(|e| e.to_string())?;
+        let auth_pubkey = their_keys
+            .first()
+            .ok_or("No recipient key for client :/ ?".to_owned())?;
+        self.create_account(auth_pubkey, &vk, &their_diddoc).await?;
+        Ok(packed_response_envelope)
+    }
+
+    pub async fn create_account(
+        &self,
+        their_vk: &VeriKey,
+        our_vk: &VeriKey,
+        did_doc: &AriesDidDoc,
+    ) -> Result<(), String> {
+        self.persistence
+            .create_account(their_vk, our_vk, &json!(did_doc).to_string())
+            .await?;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use aries_vcx::utils::encryption_envelope::EncryptionEnvelope;
+    use log::info;
+    use serde_json::Value;
+
+    use super::AgentBuilder;
+    use crate::aries_agent::utils::oob2did;
+
+    #[tokio::test]
+    pub async fn test_pack_unpack() {
+        let message: Value = serde_json::from_str("{}").unwrap();
+        let message_bytes = serde_json::to_vec(&message).unwrap();
+        let mut agent = AgentBuilder::new_demo_agent().await.unwrap();
+        agent
+            .init_service(
+                vec![],
+                "http://127.0.0.1:8005/aries".to_string().parse().unwrap(),
+            )
+            .await
+            .unwrap();
+        let their_diddoc = oob2did(agent.get_oob_invite().unwrap());
+        let our_service = agent.service.as_ref().unwrap();
+        let our_vk = our_service.recipient_keys.first().unwrap();
+        let EncryptionEnvelope(packed) = agent
+            .pack_didcomm(&message_bytes, our_vk, &their_diddoc)
+            .await
+            .unwrap();
+        let unpacked = agent.unpack_didcomm(&packed).await.unwrap();
+        info!("{:?}", unpacked);
+        print!("{:?}", unpacked);
+    }
+}
diff --git a/agents/rust/mediator/src/aries_agent/transports.rs b/agents/rust/mediator/src/aries_agent/transports.rs
new file mode 100644
index 0000000000..1c3d905ed8
--- /dev/null
+++ b/agents/rust/mediator/src/aries_agent/transports.rs
@@ -0,0 +1,69 @@
+use std::collections::VecDeque;
+
+use async_trait::async_trait;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
+use log::info;
+use serde_json::Value;
+
+#[derive(thiserror::Error, Debug)]
+#[error("{msg}")]
+pub struct AriesTransportError {
+    pub msg: String,
+}
+
+impl AriesTransportError {
+    fn from_std_error(err: impl std::error::Error) -> Self {
+        AriesTransportError {
+            msg: err.to_string(),
+        }
+    }
+}
+
+#[async_trait]
+pub trait AriesTransport {
+    fn pop_aries_envelope(&mut self) -> Result<Value, AriesTransportError>;
+    async fn push_aries_envelope(
+        &mut self,
+        envelope_json: Value,
+        destination: &AriesDidDoc,
+    ) -> Result<(), AriesTransportError>;
+}
+
+pub struct AriesReqwest {
+    pub response_queue: VecDeque<Value>,
+    pub client: reqwest::Client,
+}
+
+#[async_trait]
+impl AriesTransport for AriesReqwest {
+    async fn push_aries_envelope(
+        &mut self,
+        envelope_json: Value,
+        destination: &AriesDidDoc,
+    ) -> Result<(), AriesTransportError> {
+        let oob_invited_endpoint = destination
+            .get_endpoint()
+            .expect("Service needs an endpoint");
+        let res = self
+            .client
+            .post(oob_invited_endpoint)
+            .json(&envelope_json)
+            .send()
+            .await
+            .map_err(AriesTransportError::from_std_error)?
+            .error_for_status()
+            .map_err(AriesTransportError::from_std_error)?;
+        let res_json: Value = res
+            .json()
+            .await
+            .map_err(AriesTransportError::from_std_error)?;
+        info!("Received aries response{:?}", res_json);
+        self.response_queue.push_back(res_json);
+        Ok(())
+    }
+    fn pop_aries_envelope(&mut self) -> Result<Value, AriesTransportError> {
+        self.response_queue.pop_front().ok_or(AriesTransportError {
+            msg: "No messages in queue".to_owned(),
+        })
+    }
+}
diff --git a/agents/rust/mediator/src/aries_agent/utils.rs b/agents/rust/mediator/src/aries_agent/utils.rs
new file mode 100644
index 0000000000..3a0278e0c9
--- /dev/null
+++ b/agents/rust/mediator/src/aries_agent/utils.rs
@@ -0,0 +1,85 @@
+use aries_vcx::{
+    common::signing::sign_connection_response, errors::error::VcxResult, transport::Transport,
+};
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
+use axum::async_trait;
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
+use messages::{
+    decorators::thread::Thread,
+    msg_fields::protocols::{
+        connection::{
+            response::{Response, ResponseContent, ResponseDecorators},
+            ConnectionData,
+        },
+        out_of_band::invitation::{Invitation as OOBInvitation, OobService},
+    },
+};
+use uuid::Uuid;
+
+use crate::utils::structs::VeriKey;
+
+pub async fn build_response_content(
+    wallet: &impl BaseWallet,
+    thread_id: String,
+    old_recipient_vk: VeriKey,
+    new_recipient_did: String,
+    new_recipient_vk: VeriKey,
+    new_service_endpoint: url::Url,
+    new_routing_keys: Vec<String>,
+) -> VcxResult<Response> {
+    let mut did_doc = AriesDidDoc::default();
+    let did = new_recipient_did.clone();
+
+    did_doc.set_id(new_recipient_did);
+    did_doc.set_service_endpoint(new_service_endpoint);
+    did_doc.set_routing_keys(new_routing_keys);
+    did_doc.set_recipient_keys(vec![new_recipient_vk]);
+
+    let con_data = ConnectionData::new(did, did_doc);
+
+    let id = Uuid::new_v4().to_string();
+
+    let con_sig = sign_connection_response(wallet, &old_recipient_vk, &con_data).await?;
+
+    let content = ResponseContent::builder().connection_sig(con_sig).build();
+
+    let decorators = ResponseDecorators::builder()
+        .thread(Thread::builder().thid(thread_id).build())
+        .build();
+
+    Ok(Response::builder()
+        .id(id)
+        .content(content)
+        .decorators(decorators)
+        .build())
+}
+
+pub fn oob2did(oob: OOBInvitation) -> AriesDidDoc {
+    let mut did_doc: AriesDidDoc = AriesDidDoc::default();
+    did_doc.set_id(oob.id.clone());
+    let oob_service = oob
+        .content
+        .services
+        .first()
+        .expect("OOB needs a service")
+        .clone();
+
+    match oob_service {
+        OobService::AriesService(service) => {
+            did_doc.set_service_endpoint(service.service_endpoint);
+            did_doc.set_recipient_keys(service.recipient_keys);
+            did_doc.set_routing_keys(service.routing_keys);
+        }
+        _ => panic!("Assuming fully clean AriesService variant only"),
+    }
+    did_doc
+}
+
+pub struct MockTransport;
+
+#[async_trait]
+impl Transport for MockTransport {
+    async fn send_message(&self, _msg: Vec<u8>, _service_endpoint: url::Url) -> VcxResult<()> {
+        Ok(())
+    }
+}
diff --git a/agents/rust/mediator/src/bin/mediator.rs b/agents/rust/mediator/src/bin/mediator.rs
new file mode 100644
index 0000000000..40cf980fff
--- /dev/null
+++ b/agents/rust/mediator/src/bin/mediator.rs
@@ -0,0 +1,37 @@
+use log::info;
+use mediator::aries_agent::AgentBuilder;
+
+#[tokio::main]
+async fn main() {
+    info!("Starting up mediator! ⚙️⚙️");
+    load_dot_env();
+    setup_logging();
+    let endpoint_root = std::env::var("ENDPOINT_ROOT").unwrap_or("127.0.0.1:8005".into());
+    info!("Mediator endpoint root address {}", endpoint_root);
+    let mut agent = AgentBuilder::new_demo_agent().await.unwrap();
+    agent
+        .init_service(
+            vec![],
+            format!("http://{endpoint_root}/didcomm").parse().unwrap(),
+        )
+        .await
+        .unwrap();
+    let app_router = mediator::http_routes::build_router(agent).await;
+    axum::Server::bind(
+        &endpoint_root
+            .parse()
+            .expect("Pass an address to listen on like IP:PORT"),
+    )
+    .serve(app_router.into_make_service())
+    .await
+    .unwrap();
+}
+
+fn setup_logging() {
+    let env = env_logger::Env::default().default_filter_or("info");
+    env_logger::init_from_env(env);
+}
+
+fn load_dot_env() {
+    let _ = dotenvy::dotenv();
+}
diff --git a/agents/rust/mediator/src/didcomm_handlers/connection.rs b/agents/rust/mediator/src/didcomm_handlers/connection.rs
new file mode 100644
index 0000000000..d58e8e40e1
--- /dev/null
+++ b/agents/rust/mediator/src/didcomm_handlers/connection.rs
@@ -0,0 +1,18 @@
+use messages::msg_fields::protocols::connection::Connection;
+
+use super::{unhandled_aries_message, utils::prelude::*, ArcAgent};
+
+pub async fn handle_aries_connection<T: BaseWallet + 'static, P: MediatorPersistence>(
+    agent: ArcAgent<T, P>,
+    connection: Connection,
+) -> Result<EncryptionEnvelope, String> {
+    match connection {
+        Connection::Invitation(_invite) => {
+            Err("Mediator does not handle random invites. Sorry.".to_owned())
+        }
+        Connection::Request(register_request) => {
+            agent.handle_connection_req(register_request).await
+        }
+        _ => Err(unhandled_aries_message(connection)),
+    }
+}
diff --git a/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs b/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs
new file mode 100644
index 0000000000..0e7a929fea
--- /dev/null
+++ b/agents/rust/mediator/src/didcomm_handlers/mediator_coord.rs
@@ -0,0 +1,37 @@
+use axum::{extract::State, Json};
+use mediation::didcomm_types::mediator_coord_structs::{MediateGrantData, MediatorCoordMsgEnum};
+
+use super::utils::prelude::*;
+
+pub async fn handle_mediation_coord(
+    agent: &ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    coord_msg: MediatorCoordMsgEnum,
+    auth_pubkey: &str,
+) -> Result<MediatorCoordMsgEnum, String> {
+    if let MediatorCoordMsgEnum::MediateRequest = coord_msg {
+        let service = agent
+            .get_service_ref()
+            .ok_or("Mediation agent must have service defined.")?;
+        let mut routing_keys = Vec::new();
+        routing_keys.extend_from_slice(&service.routing_keys);
+        routing_keys.push(
+            service
+                .recipient_keys
+                .first()
+                .expect("Service must have recipient key")
+                .to_owned(),
+        );
+        let coord_response = MediatorCoordMsgEnum::MediateGrant(MediateGrantData {
+            endpoint: service.service_endpoint.to_string(),
+            routing_keys,
+        });
+        return Ok(coord_response);
+    };
+    let Json(coord_response) = mediation::routes::coordination::handle_coord_authenticated(
+        State(agent.get_persistence_ref()),
+        Json(coord_msg),
+        auth_pubkey,
+    )
+    .await;
+    Ok(coord_response)
+}
diff --git a/agents/rust/mediator/src/didcomm_handlers/mod.rs b/agents/rust/mediator/src/didcomm_handlers/mod.rs
new file mode 100644
index 0000000000..03d9b8c16f
--- /dev/null
+++ b/agents/rust/mediator/src/didcomm_handlers/mod.rs
@@ -0,0 +1,71 @@
+use std::fmt::Debug;
+
+use axum::{body::Bytes, extract::State, Json};
+use messages::AriesMessage;
+use serde::{Deserialize, Serialize};
+use serde_json::Value;
+use utils::prelude::*;
+
+mod connection;
+mod mediator_coord;
+mod pickup;
+mod utils;
+
+use connection::handle_aries_connection;
+use mediator_coord::handle_mediation_coord;
+use pickup::handle_pickup_protocol;
+
+#[derive(Debug, Serialize, Deserialize)]
+#[serde(untagged)]
+enum GeneralAriesMessage {
+    AriesVCXSupported(AriesMessage),
+    XumPickup(mediation::didcomm_types::PickupMsgEnum),
+    XumCoord(mediation::didcomm_types::mediator_coord_structs::MediatorCoordMsgEnum),
+}
+pub fn unhandled_aries_message(message: impl Debug) -> String {
+    format!("Don't know how to handle this message type {:#?}", message)
+}
+
+pub async fn handle_aries<T: BaseWallet + 'static, P: MediatorPersistence>(
+    State(agent): State<ArcAgent<T, P>>,
+    didcomm_msg: Bytes,
+) -> Result<Json<Value>, String> {
+    log::info!("processing message {:?}", &didcomm_msg);
+    let unpacked = agent.unpack_didcomm(&didcomm_msg).await.unwrap();
+    let aries_message: GeneralAriesMessage =
+        serde_json::from_str(&unpacked.message).expect("Decoding unpacked message as AriesMessage");
+    let packed_response =
+        if let GeneralAriesMessage::AriesVCXSupported(AriesMessage::Connection(conn)) =
+            aries_message
+        {
+            handle_aries_connection(agent.clone(), conn).await?
+        } else {
+            let (account_name, our_signing_key, their_diddoc) =
+                agent.auth_and_get_details(&unpacked.sender_verkey).await?;
+            let auth_pubkey = unpacked
+                .sender_verkey
+                .expect("Sender key authenticated above, so it must be present..");
+            log::info!("Processing message for {:?}", account_name);
+            match aries_message {
+                GeneralAriesMessage::AriesVCXSupported(aries_message) => {
+                    Err(unhandled_aries_message(aries_message))?
+                }
+                GeneralAriesMessage::XumCoord(coord_message) => {
+                    let coord_response =
+                        handle_mediation_coord(&agent, coord_message, &auth_pubkey).await?;
+                    let aries_response =
+                        serde_json::to_vec(&coord_response).map_err(string_from_std_error)?;
+                    agent
+                        .pack_didcomm(&aries_response, &our_signing_key, &their_diddoc)
+                        .await?
+                }
+                GeneralAriesMessage::XumPickup(pickup_message) => {
+                    handle_pickup_protocol(agent, pickup_message).await?;
+                    todo!();
+                }
+            }
+        };
+    let EncryptionEnvelope(packed_message_bytes) = packed_response;
+    let packed_json = serde_json::from_slice(&packed_message_bytes[..]).unwrap();
+    Ok(Json(packed_json))
+}
diff --git a/agents/rust/mediator/src/didcomm_handlers/pickup.rs b/agents/rust/mediator/src/didcomm_handlers/pickup.rs
new file mode 100644
index 0000000000..90f0ba6dae
--- /dev/null
+++ b/agents/rust/mediator/src/didcomm_handlers/pickup.rs
@@ -0,0 +1,10 @@
+use mediation::didcomm_types::PickupMsgEnum;
+
+use super::utils::prelude::*;
+
+pub async fn handle_pickup_protocol(
+    _agent: ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    _pickup_msg: PickupMsgEnum,
+) -> Result<EncryptionEnvelope, String> {
+    todo!()
+}
diff --git a/agents/rust/mediator/src/didcomm_handlers/utils.rs b/agents/rust/mediator/src/didcomm_handlers/utils.rs
new file mode 100644
index 0000000000..81580a8c56
--- /dev/null
+++ b/agents/rust/mediator/src/didcomm_handlers/utils.rs
@@ -0,0 +1,9 @@
+pub mod prelude {
+    pub use std::sync::Arc;
+
+    pub use aries_vcx::utils::encryption_envelope::EncryptionEnvelope;
+    pub use aries_vcx_core::wallet::base_wallet::BaseWallet;
+    pub use mediation::storage::MediatorPersistence;
+
+    pub use crate::{aries_agent::ArcAgent, utils::prelude::*};
+}
diff --git a/agents/rust/mediator/src/http_routes/mod.rs b/agents/rust/mediator/src/http_routes/mod.rs
new file mode 100644
index 0000000000..2c5c3d21a8
--- /dev/null
+++ b/agents/rust/mediator/src/http_routes/mod.rs
@@ -0,0 +1,78 @@
+use std::sync::Arc;
+
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
+use axum::{
+    body::Bytes,
+    extract::State,
+    http::header::{HeaderMap, ACCEPT},
+    response::{Html, IntoResponse, Response},
+    routing::get,
+    Json, Router,
+};
+use mediation::storage::MediatorPersistence;
+use serde_json::Value;
+
+use crate::{
+    aries_agent::{Agent, ArcAgent},
+    didcomm_handlers,
+};
+
+pub async fn oob_invite_qr(
+    headers: HeaderMap,
+    State(agent): State<ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>>,
+) -> Response {
+    let Json(oob_json) = oob_invite_json(State(agent)).await;
+    let preferred_mimetype = headers
+        .get(ACCEPT)
+        .map(|s| s.to_str().unwrap_or_default())
+        .unwrap_or_default();
+    match preferred_mimetype {
+        "application/json" => Json(oob_json).into_response(),
+        _ => {
+            let oob_string = serde_json::to_string_pretty(&oob_json).unwrap();
+            let qr = fast_qr::QRBuilder::new(oob_string.clone()).build().unwrap();
+            let oob_qr_svg = fast_qr::convert::svg::SvgBuilder::default().to_str(&qr);
+            Html(format!(
+                "<style>
+                        svg {{
+                            width: 50%;
+                            height: 50%;
+                        }}
+                    </style>
+                    {oob_qr_svg} <br>
+                    <pre>{oob_string}</pre>"
+            ))
+            .into_response()
+        }
+    }
+}
+
+pub async fn oob_invite_json(
+    State(agent): State<ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>>,
+) -> Json<Value> {
+    let oob = agent.get_oob_invite().unwrap();
+    Json(serde_json::to_value(oob).unwrap())
+}
+
+pub async fn handle_didcomm(
+    State(agent): State<ArcAgent<impl BaseWallet + 'static, impl MediatorPersistence>>,
+    didcomm_msg: Bytes,
+) -> Result<Json<Value>, String> {
+    didcomm_handlers::handle_aries(State(agent), didcomm_msg).await
+}
+
+pub async fn readme() -> Html<String> {
+    Html("<p>Please refer to the API section of <a>readme</a> for usage. Thanks. </p>".into())
+}
+
+pub async fn build_router(
+    agent: Agent<impl BaseWallet + 'static, impl MediatorPersistence>,
+) -> Router {
+    Router::default()
+        .route("/", get(readme))
+        .route("/register", get(oob_invite_qr))
+        .route("/register.json", get(oob_invite_json))
+        .route("/didcomm", get(handle_didcomm).post(handle_didcomm))
+        .layer(tower_http::catch_panic::CatchPanicLayer::new())
+        .with_state(Arc::new(agent))
+}
diff --git a/agents/rust/mediator/src/lib.rs b/agents/rust/mediator/src/lib.rs
new file mode 100644
index 0000000000..09271b929e
--- /dev/null
+++ b/agents/rust/mediator/src/lib.rs
@@ -0,0 +1,4 @@
+pub mod aries_agent;
+pub mod didcomm_handlers;
+pub mod http_routes;
+pub mod utils;
diff --git a/agents/rust/mediator/src/utils/binary_utils.rs b/agents/rust/mediator/src/utils/binary_utils.rs
new file mode 100644
index 0000000000..751c5390cf
--- /dev/null
+++ b/agents/rust/mediator/src/utils/binary_utils.rs
@@ -0,0 +1,8 @@
+pub fn setup_logging() {
+    let env = env_logger::Env::default().default_filter_or("info");
+    env_logger::init_from_env(env);
+}
+
+pub fn load_dot_env() {
+    let _ = dotenvy::dotenv();
+}
diff --git a/agents/rust/mediator/src/utils/mod.rs b/agents/rust/mediator/src/utils/mod.rs
new file mode 100644
index 0000000000..5efe89a809
--- /dev/null
+++ b/agents/rust/mediator/src/utils/mod.rs
@@ -0,0 +1,15 @@
+pub use prelude::*;
+
+pub mod binary_utils;
+pub mod prelude;
+pub mod structs;
+///// Utility function for mapping any error into a `500 Internal Server Error`
+///// response.
+// fn internal_error<E>(err: E) -> (axum::http::StatusCode, String)
+// where
+//     E: std::error::Error,
+// {
+//     (axum::http::StatusCode::INTERNAL_SERVER_ERROR, err.to_string())
+// }
+
+// impl From<AriesVcxCoreError> for String {}
diff --git a/agents/rust/mediator/src/utils/prelude.rs b/agents/rust/mediator/src/utils/prelude.rs
new file mode 100644
index 0000000000..b95971cf93
--- /dev/null
+++ b/agents/rust/mediator/src/utils/prelude.rs
@@ -0,0 +1,18 @@
+pub use log::{debug, error, info};
+
+// Generic Wrapper struct for newtype pattern
+// for implementing external trait on external types
+// pub struct Wrapper<T>(pub T);
+
+// Generic Result
+// pub type Result_<T> = Result<T, Box<dyn Error>>;
+
+pub fn string_from_std_error(err: impl std::error::Error) -> String {
+    err.to_string()
+}
+
+#[derive(thiserror::Error, Debug)]
+#[error("{msg}")]
+pub struct GenericStringError {
+    pub msg: String,
+}
diff --git a/agents/rust/mediator/src/utils/structs.rs b/agents/rust/mediator/src/utils/structs.rs
new file mode 100644
index 0000000000..99ecbf11d6
--- /dev/null
+++ b/agents/rust/mediator/src/utils/structs.rs
@@ -0,0 +1 @@
+pub type VeriKey = String;
diff --git a/agents/rust/mediator/tests/common/mod.rs b/agents/rust/mediator/tests/common/mod.rs
new file mode 100644
index 0000000000..f4c208d9db
--- /dev/null
+++ b/agents/rust/mediator/tests/common/mod.rs
@@ -0,0 +1,23 @@
+#![allow(dead_code)]
+
+pub mod test_setup {
+    // inspired by
+    // https://stackoverflow.com/questions/58006033/how-to-run-setup-code-before-any-tests-run-in-rust
+    use std::sync::Once;
+
+    static INIT: Once = Once::new();
+    pub trait OneTimeInit {
+        // runs the initialization code if it hasn't been run yet, else does nothing
+        fn init(&self) {
+            INIT.call_once(|| self.one_time_setup_code());
+        }
+        // your custom initialization code goes here
+        fn one_time_setup_code(&self);
+    }
+}
+
+pub mod prelude {
+    pub use anyhow::Result;
+    pub use log::{debug, error, info};
+    pub use url::Url;
+}
diff --git a/agents/rust/mediator/tests/mediator-aries-connection.rs b/agents/rust/mediator/tests/mediator-aries-connection.rs
new file mode 100644
index 0000000000..d0a8ead370
--- /dev/null
+++ b/agents/rust/mediator/tests/mediator-aries-connection.rs
@@ -0,0 +1,52 @@
+mod common;
+use std::collections::VecDeque;
+
+use common::{prelude::*, test_setup::OneTimeInit};
+use mediator::aries_agent::transports::AriesReqwest;
+use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
+use reqwest::header::ACCEPT;
+
+const ENDPOINT_ROOT: &str = "http://localhost:8005";
+
+struct TestSetupAries;
+impl OneTimeInit for TestSetupAries {
+    fn one_time_setup_code(&self) {
+        fn setup_logging() {
+            let env = env_logger::Env::default().default_filter_or("info");
+            env_logger::init_from_env(env);
+        }
+        fn load_dot_env() {
+            let _ = dotenvy::dotenv();
+        }
+        load_dot_env();
+        setup_logging();
+    }
+}
+
+#[tokio::test]
+async fn didcomm_connection_succeeds() -> Result<()> {
+    TestSetupAries.init();
+    let client = reqwest::Client::new();
+    let base: Url = ENDPOINT_ROOT.parse().unwrap();
+    let endpoint_register = base.join("register").unwrap();
+
+    let oobi: OOBInvitation = client
+        .get(endpoint_register)
+        .header(ACCEPT, "application/json")
+        .send()
+        .await?
+        .error_for_status()?
+        .json()
+        .await?;
+    info!("Got invitation from register endpoint {:?}", oobi);
+    let agent = mediator::aries_agent::AgentBuilder::new_demo_agent().await?;
+    let mut aries_transport = AriesReqwest {
+        response_queue: VecDeque::new(),
+        client: reqwest::Client::new(),
+    };
+    let _state = agent
+        .establish_connection(oobi, &mut aries_transport)
+        .await?;
+
+    Ok(())
+}
diff --git a/agents/rust/mediator/tests/mediator-coord-protocol.rs b/agents/rust/mediator/tests/mediator-coord-protocol.rs
new file mode 100644
index 0000000000..ce61bd9047
--- /dev/null
+++ b/agents/rust/mediator/tests/mediator-coord-protocol.rs
@@ -0,0 +1,316 @@
+mod common;
+use std::collections::VecDeque;
+
+use aries_vcx::protocols::connection::invitee::{states::completed::Completed, InviteeConnection};
+use aries_vcx_core::wallet::base_wallet::BaseWallet;
+use common::{prelude::*, test_setup::OneTimeInit};
+use diddoc_legacy::aries::diddoc::AriesDidDoc;
+use mediation::{
+    didcomm_types::mediator_coord_structs::{
+        KeylistData, KeylistQueryData, KeylistUpdateItem, KeylistUpdateItemAction,
+        KeylistUpdateRequestData, MediatorCoordMsgEnum,
+    },
+    storage::MediatorPersistence,
+};
+use mediator::{
+    aries_agent::{
+        transports::{AriesReqwest, AriesTransport},
+        Agent,
+    },
+    utils::{structs::VeriKey, GenericStringError},
+};
+use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
+use reqwest::header::ACCEPT;
+
+const ENDPOINT_ROOT: &str = "http://localhost:8005";
+
+struct TestSetupAries;
+impl OneTimeInit for TestSetupAries {
+    fn one_time_setup_code(&self) {
+        fn setup_logging() {
+            let env = env_logger::Env::default().default_filter_or("info");
+            env_logger::init_from_env(env);
+        }
+        fn load_dot_env() {
+            let _ = dotenvy::dotenv();
+        }
+        load_dot_env();
+        setup_logging();
+    }
+}
+async fn didcomm_connection(
+    agent: &Agent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    aries_transport: &mut impl AriesTransport,
+) -> Result<InviteeConnection<Completed>> {
+    let client = reqwest::Client::new();
+    let base: Url = ENDPOINT_ROOT.parse().unwrap();
+    let endpoint_register = base.join("register").unwrap();
+
+    let oobi: OOBInvitation = client
+        .get(endpoint_register)
+        .header(ACCEPT, "application/json")
+        .send()
+        .await?
+        .error_for_status()?
+        .json()
+        .await?;
+    info!("Got invitation from register endpoint {:?}", oobi);
+
+    let state: InviteeConnection<Completed> =
+        agent.establish_connection(oobi, aries_transport).await?;
+
+    Ok(state)
+}
+
+/// Returns agent, aries transport for agent, agent's verikey, and mediator's diddoc.
+async fn gen_mediator_connected_agent() -> Result<(
+    Agent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    impl AriesTransport,
+    VeriKey,
+    AriesDidDoc,
+)> {
+    let agent = mediator::aries_agent::AgentBuilder::new_demo_agent().await?;
+    let mut aries_transport = AriesReqwest {
+        response_queue: VecDeque::new(),
+        client: reqwest::Client::new(),
+    };
+    let completed_connection = didcomm_connection(&agent, &mut aries_transport).await?;
+    let our_verikey: VeriKey = completed_connection.pairwise_info().pw_vk.clone();
+    let their_diddoc = completed_connection.their_did_doc().clone();
+    Ok((agent, aries_transport, our_verikey, their_diddoc))
+}
+
+/// Sends message over didcomm connection and returns unpacked response message
+async fn send_message_and_pop_response_message(
+    message_bytes: &[u8],
+    agent: &Agent<impl BaseWallet + 'static, impl MediatorPersistence>,
+    aries_transport: &mut impl AriesTransport,
+    our_verikey: &VeriKey,
+    their_diddoc: &AriesDidDoc,
+) -> Result<String> {
+    agent
+        .pack_and_send_didcomm(message_bytes, our_verikey, their_diddoc, aries_transport)
+        .await
+        .map_err(|err| GenericStringError { msg: err })?;
+    // unpack
+    let response = aries_transport.pop_aries_envelope()?;
+    let unpacked_response = agent
+        .unpack_didcomm(&serde_json::to_vec(&response).unwrap())
+        .await
+        .unwrap();
+    Ok(unpacked_response.message)
+}
+
+#[tokio::test]
+#[ignore]
+async fn test_init() {
+    TestSetupAries.init();
+    let agent = mediator::aries_agent::AgentBuilder::new_demo_agent()
+        .await
+        .unwrap();
+    let mut aries_transport = AriesReqwest {
+        response_queue: VecDeque::new(),
+        client: reqwest::Client::new(),
+    };
+    let _ = didcomm_connection(&agent, &mut aries_transport).await;
+    let _ = didcomm_connection(&agent, &mut aries_transport).await;
+}
+
+#[tokio::test]
+async fn test_mediate_grant() -> Result<()> {
+    TestSetupAries.init();
+    // prepare connection parameters
+    let (agent, mut aries_transport, our_verikey, their_diddoc) =
+        gen_mediator_connected_agent().await?;
+    // prepare request message
+    let message = MediatorCoordMsgEnum::MediateRequest;
+    let message_bytes = serde_json::to_vec(&message)?;
+    // send message and get response
+    let response_message = send_message_and_pop_response_message(
+        &message_bytes,
+        &agent,
+        &mut aries_transport,
+        &our_verikey,
+        &their_diddoc,
+    )
+    .await?;
+    // verify response
+    if let MediatorCoordMsgEnum::MediateGrant(grant_data) =
+        serde_json::from_str(&response_message).unwrap()
+    {
+        info!("Grant Data {:?}", grant_data);
+    } else if let MediatorCoordMsgEnum::MediateDeny(deny_data) =
+        serde_json::from_str(&response_message).unwrap()
+    {
+        info!("Deny Data {:?}", deny_data);
+    } else {
+        panic!(
+            "Should get response that is of type Mediator Grant / Deny. Found {:?}",
+            response_message
+        )
+    };
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn test_mediate_keylist_update_add() -> Result<()> {
+    TestSetupAries.init();
+    // prepare connection parameters
+    let (agent, mut aries_transport, our_verikey, their_diddoc) =
+        gen_mediator_connected_agent().await?;
+    // prepare request message
+    let (_, new_vk) = agent
+        .get_wallet_ref()
+        .create_and_store_my_did(None, None)
+        .await?;
+    let message = MediatorCoordMsgEnum::KeylistUpdateRequest(KeylistUpdateRequestData {
+        updates: vec![KeylistUpdateItem {
+            recipient_key: new_vk,
+            action: KeylistUpdateItemAction::Add,
+            result: None,
+        }],
+    });
+    info!("Sending {:?}", serde_json::to_string(&message).unwrap());
+    let message_bytes = serde_json::to_vec(&message)?;
+    // send message and get response
+    let response_message = send_message_and_pop_response_message(
+        &message_bytes,
+        &agent,
+        &mut aries_transport,
+        &our_verikey,
+        &their_diddoc,
+    )
+    .await?;
+    // verify response
+    if let MediatorCoordMsgEnum::KeylistUpdateResponse(update_response_data) =
+        serde_json::from_str(&response_message)?
+    {
+        info!("Received update response {:?}", update_response_data);
+    } else {
+        panic!(
+            "Expected message of type KeylistUpdateResponse. Found {:?}",
+            response_message
+        )
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn test_mediate_keylist_query() -> Result<()> {
+    TestSetupAries.init();
+    // prepare connection parameters
+    let (agent, mut aries_transport, our_verikey, their_diddoc) =
+        gen_mediator_connected_agent().await?;
+    // prepare request message: add key
+    let (_, new_vk) = agent
+        .get_wallet_ref()
+        .create_and_store_my_did(None, None)
+        .await?;
+    let message = MediatorCoordMsgEnum::KeylistUpdateRequest(KeylistUpdateRequestData {
+        updates: vec![KeylistUpdateItem {
+            recipient_key: new_vk,
+            action: KeylistUpdateItemAction::Add,
+            result: None,
+        }],
+    });
+    let message_bytes = serde_json::to_vec(&message)?;
+    // send message and get response
+    let _ = send_message_and_pop_response_message(
+        &message_bytes,
+        &agent,
+        &mut aries_transport,
+        &our_verikey,
+        &their_diddoc,
+    )
+    .await?;
+    info!("Proceeding to keylist query");
+    //prepare request message: list keys
+    let message = MediatorCoordMsgEnum::KeylistQuery(KeylistQueryData {});
+    info!("Sending {:?}", serde_json::to_string(&message).unwrap());
+    let message_bytes = serde_json::to_vec(&message)?;
+    // send message and get response
+    let response_message = send_message_and_pop_response_message(
+        &message_bytes,
+        &agent,
+        &mut aries_transport,
+        &our_verikey,
+        &their_diddoc,
+    )
+    .await?;
+    // verify
+    if let MediatorCoordMsgEnum::Keylist(KeylistData { keys }) =
+        serde_json::from_str(&response_message)?
+    {
+        info!("Keylist mediator sent {:?}", keys)
+    } else {
+        panic!(
+            "Expected message of type Keylist. Found {:?}",
+            response_message
+        )
+    }
+
+    Ok(())
+}
+
+#[tokio::test]
+async fn test_mediate_keylist_update_remove() -> Result<()> {
+    TestSetupAries.init();
+    // prepare connection parameters
+    let (agent, mut aries_transport, our_verikey, their_diddoc) =
+        gen_mediator_connected_agent().await?;
+    // prepare request message: add key
+    let (_, new_vk) = agent
+        .get_wallet_ref()
+        .create_and_store_my_did(None, None)
+        .await?;
+    let message = MediatorCoordMsgEnum::KeylistUpdateRequest(KeylistUpdateRequestData {
+        updates: vec![KeylistUpdateItem {
+            recipient_key: new_vk.clone(),
+            action: KeylistUpdateItemAction::Add,
+            result: None,
+        }],
+    });
+    let message_bytes = serde_json::to_vec(&message)?;
+    // send message and get response
+    let _ = send_message_and_pop_response_message(
+        &message_bytes,
+        &agent,
+        &mut aries_transport,
+        &our_verikey,
+        &their_diddoc,
+    )
+    .await?;
+    info!("Proceeding to delete");
+    // prepare request message: delete key
+    let message = MediatorCoordMsgEnum::KeylistUpdateRequest(KeylistUpdateRequestData {
+        updates: vec![KeylistUpdateItem {
+            recipient_key: new_vk,
+            action: KeylistUpdateItemAction::Remove,
+            result: None,
+        }],
+    });
+    info!("Sending {:?}", serde_json::to_string(&message).unwrap());
+    let message_bytes = serde_json::to_vec(&message)?;
+    // send message and get response
+    let response_message = send_message_and_pop_response_message(
+        &message_bytes,
+        &agent,
+        &mut aries_transport,
+        &our_verikey,
+        &their_diddoc,
+    )
+    .await?;
+    if let MediatorCoordMsgEnum::KeylistUpdateResponse(update_response_data) =
+        serde_json::from_str(&response_message)?
+    {
+        info!("Received update response {:?}", update_response_data);
+    } else {
+        panic!(
+            "Expected message of type KeylistUpdateResponse. Found {:?}",
+            response_message
+        )
+    }
+    Ok(())
+}
diff --git a/agents/rust/mediator/tests/mediator-oob-invitation.rs b/agents/rust/mediator/tests/mediator-oob-invitation.rs
new file mode 100644
index 0000000000..507dca72cf
--- /dev/null
+++ b/agents/rust/mediator/tests/mediator-oob-invitation.rs
@@ -0,0 +1,76 @@
+use anyhow::Result;
+use messages::msg_fields::protocols::out_of_band::invitation::Invitation as OOBInvitation;
+use reqwest::header::{ACCEPT, CONTENT_TYPE};
+use url::Url;
+
+const ENDPOINT_ROOT: &str = "http://localhost:8005";
+
+#[test]
+fn endpoint_register_json_returns_oob() -> Result<()> {
+    let client = reqwest::blocking::Client::new();
+    let base: Url = ENDPOINT_ROOT.parse().unwrap();
+    let endpoint_register_json = base.join("/register.json").unwrap();
+
+    let res = client
+        .get(endpoint_register_json)
+        .send()?
+        .error_for_status()?;
+    println!("{:?}", res);
+
+    let _oob: OOBInvitation = res.json()?;
+
+    Ok(())
+}
+
+#[test]
+fn endpoint_register_returns_oob_with_correct_accept_header() -> Result<()> {
+    let client = reqwest::blocking::Client::new();
+    let base: Url = ENDPOINT_ROOT.parse().unwrap();
+    let endpoint_register = base.join("/register").unwrap();
+
+    let res = client
+        .get(endpoint_register)
+        .header(ACCEPT, "application/json")
+        .send()?
+        .error_for_status()?;
+    println!("{:?}", res);
+
+    let _oob: OOBInvitation = res.json()?;
+
+    Ok(())
+}
+
+#[test]
+fn endpoint_register_returns_html_page() -> Result<()> {
+    let client = reqwest::blocking::Client::new();
+    let base: Url = ENDPOINT_ROOT.parse().unwrap();
+    let endpoint_register = base.join("/register").unwrap();
+
+    let res = client.get(endpoint_register).send()?.error_for_status()?;
+    println!("{:?}", res);
+
+    assert!(res
+        .headers()
+        .get(CONTENT_TYPE)
+        .unwrap()
+        .to_str()
+        .unwrap()
+        .contains("text/html"));
+
+    Ok(())
+}
+
+#[test]
+#[ignore]
+fn endpoint_register_returns_html_page_with_valid_oob_qr() -> Result<()> {
+    let client = reqwest::blocking::Client::new();
+    let base: Url = ENDPOINT_ROOT.parse().unwrap();
+    let endpoint_register = base.join("/register").unwrap();
+
+    let res = client.get(endpoint_register).send()?.error_for_status()?;
+    println!("{:?}", res);
+
+    let _html = res.text()?;
+    // validate qr of html page
+    unimplemented!("validate oob qr of returned html page");
+}