diff --git a/src/main/python/ddadevops/release_mixin/build.py b/src/main/python/ddadevops/release_mixin/build.py
index cfedec4..641ae3a 100644
--- a/src/main/python/ddadevops/release_mixin/build.py
+++ b/src/main/python/ddadevops/release_mixin/build.py
@@ -1,3 +1,5 @@
+# TODO: jem, zam - 2023_04_18: move this to an build-test repo?
+
 import sys
 import os
 from pathlib import Path
diff --git a/src/main/python/ddadevops/release_mixin/config.json b/src/main/python/ddadevops/release_mixin/config.json
index 6068f8d..359f087 100644
--- a/src/main/python/ddadevops/release_mixin/config.json
+++ b/src/main/python/ddadevops/release_mixin/config.json
@@ -1,3 +1,4 @@
+// TODO: jem, zam - 2023_04_18: move this to an build-test repo ?
 {
     "version": "123.125.1-SNAPSHOT"
 }
\ No newline at end of file
diff --git a/src/main/python/ddadevops/release_mixin/doc/arch.md b/src/main/python/ddadevops/release_mixin/doc/arch.md
index 201223d..d8b63fe 100644
--- a/src/main/python/ddadevops/release_mixin/doc/arch.md
+++ b/src/main/python/ddadevops/release_mixin/doc/arch.md
@@ -1 +1,3 @@
+# TODO: jem, zam - 2023_04_18: move this to doc/architecture & use markup instead of link
+
 [![](https://mermaid.ink/img/pako:eNrtV99vmzAQ_lcsPzUSrUjIj8JDpUqb9jSpaqs9TJGQg6_UGxhmTNes6v8-E0MCGIem6-MiBYnz3Xd3vu8ulxccZRRwgAv4VQKP4BMjsSApUp81r54CIolEvDmbup6D6sdEn21KllB0fnWFbiEBUsBX9sx4gMKQcSbD8CwX2Q9l76Ao4w8sDh9YArUtiSR7IhI6pge3HWnl4QuT1zlrYU8sirXgfpvDLeRZwWQmti07DVRb50RIFrGccNk2tEB_A1GwjA_Cmhm2sWvL4yEP4ho-neEMHZQSxsONIDx6tGenD4BTo7oO8tV3NVLaXIBChVBoaVOFPc7MrfixcNDCtRXoRkPU8jsQTyyCVsbGbfQZMwigdQaPbHccg-zn0WflQb2TzEF8jHIt_FCqM5uTrl3HUfeo0wgVeqJQChlGWZoyacBrTS2kMCi2u2mdBOjQly2c8eh7kAPtUyXxpMVG-Ia6PjfENuwkI3TXjw3ymy0VhVTJ3mza4m5l46A6ozBhhZwY92bJ6yi1zPaort1psNSALYUALrv9v29zs2p972Pn4wgfMAJ-CyYhJJzWjO5352h3B6jpNxupOmOwfunWMhKgFEMD6FgPjIVnHXlGxo27OpzJO8baiS2oQ9iRveFtIQXj8ajvZhIRSs_erNydVeYP0QeyZ1Om-QnUqdSHyn06d2xI_4nzYcRpXeWRdWBPr4GFpyLaym3xzLbySBLvLjovi8fDRDqyqt6T-JrTG6Vu3XE6S-g-E5vhu3wNh61hrI7GIU9BakqnQ-GZVEnSf4zh5HSaICrDAfbYbG0du7v6HqmqJ3ZwCkLt4FT9m3qpJGssHyGFNVadhSkRP9d4zV-VHilldrflEQ4eSFKAg8ucKg_1X6-e9DOt2m0vVLv89yxTSlKU-hUHL_gZB-fT6cWlt_Td5dzz1ACdL30Hb5Xcny4uZjN_7k2ni5k39y5fHfxnBzG7cD135fnzxdJfrObu6vUveFPSvA?type=png)](https://mermaid.live/edit#pako:eNrtV99vmzAQ_lcsPzUSrUjIj8JDpUqb9jSpaqs9TJGQg6_UGxhmTNes6v8-E0MCGIem6-MiBYnz3Xd3vu8ulxccZRRwgAv4VQKP4BMjsSApUp81r54CIolEvDmbup6D6sdEn21KllB0fnWFbiEBUsBX9sx4gMKQcSbD8CwX2Q9l76Ao4w8sDh9YArUtiSR7IhI6pge3HWnl4QuT1zlrYU8sirXgfpvDLeRZwWQmti07DVRb50RIFrGccNk2tEB_A1GwjA_Cmhm2sWvL4yEP4ho-neEMHZQSxsONIDx6tGenD4BTo7oO8tV3NVLaXIBChVBoaVOFPc7MrfixcNDCtRXoRkPU8jsQTyyCVsbGbfQZMwigdQaPbHccg-zn0WflQb2TzEF8jHIt_FCqM5uTrl3HUfeo0wgVeqJQChlGWZoyacBrTS2kMCi2u2mdBOjQly2c8eh7kAPtUyXxpMVG-Ia6PjfENuwkI3TXjw3ymy0VhVTJ3mza4m5l46A6ozBhhZwY92bJ6yi1zPaort1psNSALYUALrv9v29zs2p972Pn4wgfMAJ-CyYhJJzWjO5352h3B6jpNxupOmOwfunWMhKgFEMD6FgPjIVnHXlGxo27OpzJO8baiS2oQ9iRveFtIQXj8ajvZhIRSs_erNydVeYP0QeyZ1Om-QnUqdSHyn06d2xI_4nzYcRpXeWRdWBPr4GFpyLaym3xzLbySBLvLjovi8fDRDqyqt6T-JrTG6Vu3XE6S-g-E5vhu3wNh61hrI7GIU9BakqnQ-GZVEnSf4zh5HSaICrDAfbYbG0du7v6HqmqJ3ZwCkLt4FT9m3qpJGssHyGFNVadhSkRP9d4zV-VHilldrflEQ4eSFKAg8ucKg_1X6-e9DOt2m0vVLv89yxTSlKU-hUHL_gZB-fT6cWlt_Td5dzz1ACdL30Hb5Xcny4uZjN_7k2ni5k39y5fHfxnBzG7cD135fnzxdJfrObu6vUveFPSvA)
\ No newline at end of file
diff --git a/src/main/python/ddadevops/release_mixin/domain.py b/src/main/python/ddadevops/release_mixin/domain.py
index c7cf406..4ad8822 100644
--- a/src/main/python/ddadevops/release_mixin/domain.py
+++ b/src/main/python/ddadevops/release_mixin/domain.py
@@ -1,3 +1,4 @@
+# TODO: jem, zam - 2023_04_18: Mv this to src/main/python/ddadevops/domain/release.py
 from enum import Enum
 from pathlib import Path
 
@@ -57,6 +58,7 @@ class Version():
         bump_version.increment(ReleaseType.BUMP)
         return bump_version
 
+# TODO: jem, zam - 2023_04_18: xtend abstract validateable
 class Release():
     def __init__(self, release_type: ReleaseType, version: Version, current_branch: str):
         self.release_type = release_type
diff --git a/src/main/python/ddadevops/release_mixin/infrastructure.py b/src/main/python/ddadevops/release_mixin/infrastructure.py
index d63af7f..7adae14 100644
--- a/src/main/python/ddadevops/release_mixin/infrastructure.py
+++ b/src/main/python/ddadevops/release_mixin/infrastructure.py
@@ -1,4 +1,4 @@
-# TODO: jem, zam - 2023_04_14: move content to src/main/python/ddadevops/infrastructure.py (or subdir)
+# TODO: jem, zam - 2023_04_18: move content to src/main/python/ddadevops/infrastructure/repo.py (or subdir)
 from .domain import Release, Version, ReleaseType, EnvironmentKeys
 from .infrastructure_api import FileHandler, GitApi, EnvironmentApi