diff --git a/TODO.txt b/TODO.txt
index 702bfcf3f..99dfffbdb 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,7 +1,14 @@
 # List of minor Todos
 
+?? Default Translation Configuration in AEM?
+
 https://wcm.io/caconfig/editor/usage.html translation config drop down
 
+Generated with ... in conf pages
+http://localhost:4502/editor.html/content/dam/wknd/en/magazine/arctic-surfing/aloha-spirits-in-northern-norway doesnt add page text or component text!!!
+
+- default icon for ai.composum site
+!!! Dictation in Chat repeat in history bar.
 !! Empty prompt text
 !! http://localhost:5502/editor.html/content/xxx/com/en/about-us/going-forward.html "Explore the world..." RTE
 PDF and markdown as possible datatypes for the content creation dialog
@@ -13,6 +20,8 @@ Why are the teasers in
 https://author-p43852-e197429.adobeaemcloud.com/editor.html/content/gfps/com/en/products-solutions/systems/primofit.html
 not included into the excerpt.
 
+? Add history in content creation dialog, current component, last text, ...
+
 ----------------
 
 - Marker on page whenever a translation is in progress
diff --git a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AITranslatePropertyWrapper.java b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AITranslatePropertyWrapper.java
index 0a0e19289..262757507 100644
--- a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AITranslatePropertyWrapper.java
+++ b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AITranslatePropertyWrapper.java
@@ -11,7 +11,7 @@
 import org.apache.sling.api.resource.ModifiableValueMap;
 import org.apache.sling.api.resource.ValueMap;
 
-class AITranslatePropertyWrapper {
+public class AITranslatePropertyWrapper {
 
     /**
      * PageContent only property: saves the additional instructions the page was translated with.
@@ -62,6 +62,12 @@ class AITranslatePropertyWrapper {
      */
     public static final String AI_MANUAL_CHANGE_SUFFIX = "_manualChange";
 
+    /**
+     * Attribute that is set on jcr:content of a page when the translation of a page failed, to make it easy to find such pages. Not set by {@link AITranslatePropertyWrapper}, but since all property names are defined here...
+     * Is set to the time at which the error occurred, to make it easy to find in the logs.
+     */
+    public static final String AI_TRANSLATION_ERRORMARKER = "ai_translationError";
+
     private final ModifiableValueMap targetValueMap;
     private final String propertyName;
     private final ValueMap sourceValueMap;
diff --git a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoPageTranslateServiceImpl.java b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoPageTranslateServiceImpl.java
index 714d237c0..5a377e8ad 100644
--- a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoPageTranslateServiceImpl.java
+++ b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoPageTranslateServiceImpl.java
@@ -1,5 +1,6 @@
 package com.composum.ai.aem.core.impl.autotranslate;
 
+import static com.composum.ai.aem.core.impl.autotranslate.AITranslatePropertyWrapper.AI_TRANSLATION_ERRORMARKER;
 import static com.composum.ai.backend.base.service.chat.impl.GPTTranslationServiceImpl.LASTID;
 import static com.composum.ai.backend.base.service.chat.impl.GPTTranslationServiceImpl.MULTITRANSLATION_SEPARATOR_END;
 import static com.composum.ai.backend.base.service.chat.impl.GPTTranslationServiceImpl.MULTITRANSLATION_SEPARATOR_START;
@@ -131,9 +132,23 @@ public Stats translateLiveCopy(@Nonnull Resource resource,
             if (translationParameters.rules != null) {
                 allRules.addAll(translationParameters.rules);
             }
+
             if (autoTranslateCaConfig.rules() != null) {
                 allRules.addAll(Arrays.asList(autoTranslateCaConfig.rules()));
             }
+            if (autoTranslateCaConfig.temperature() != null && !autoTranslateCaConfig.temperature().trim().isEmpty()) {
+                try {
+                    double temperature = Double.parseDouble(autoTranslateCaConfig.temperature());
+                    configuration = GPTConfiguration.ofTemperature(temperature).merge(configuration);
+                } catch (NumberFormatException e) {
+                    LOG.error("Invalid temperature value {} for path {}", autoTranslateCaConfig.temperature(), resource.getPath());
+                }
+            }
+            if (autoTranslateCaConfig.preferHighIntelligenceModel()) {
+                configuration = GPTConfiguration.HIGH_INTELLIGENCE.merge(configuration);
+            } else if (autoTranslateCaConfig.preferStandardModel()) {
+                configuration = GPTConfiguration.STANDARD_INTELLIGENCE.merge(configuration);
+            }
 
             // collect translation rules that apply
             List<PropertyToTranslate> allTranslateableProperties = new ArrayList<>();
@@ -364,9 +379,6 @@ protected String remapPaths(String translatedValue, String blueprintPath, String
         Pattern pattern = Pattern.compile("href=\"" +
                 Pattern.quote(blueprintPath) + "(/[^\"]*)\"");
         String result = pattern.matcher(translatedValue).replaceAll("href=\"" + livecopyPath + "$1\"");
-        if (translatedValue.contains("href")) { // FIXME(hps,24/10/03) no checkin
-            LOG.trace("Remapping paths from {} to {} in {}", blueprintPath, livecopyPath, translatedValue);
-        }
         return result;
     }
 
@@ -392,6 +404,7 @@ protected void markAsAiTranslated(Resource resource, LiveRelationship liveRelati
             liveRelationshipManager.cancelPropertyRelationship(resource.getResourceResolver(),
                     liveRelationship, targetWrapper.allGeneralKeys(), false);
         }
+        valueMap.put(AI_TRANSLATION_ERRORMARKER, Boolean.FALSE); // reset error marker if there was one.
     }
 
     /**
@@ -581,10 +594,6 @@ protected boolean collectPropertiesToTranslate(
             stats.translateableProperties++;
             AITranslatePropertyWrapper targetWrapper = new AITranslatePropertyWrapper(sourceValueMap, targetValueMap, key);
 
-            if (StringUtils.contains(targetWrapper.getOriginalCopy(), "href")) { // FIXME(hps,24/10/03) no checkin
-                LOG.trace("Skipping {} in {} because it contains href", key, resource.getPath());
-            }
-
             // we will translate except if the property is cancelled and we don't want to touch cancelled properties,
             // or if we have a current translation.
             boolean isCancelled = isCancelled(resource, key, relationship);
@@ -621,6 +630,10 @@ protected boolean collectPropertiesToTranslate(
             propertyToTranslate.propertyName = key;
             propertyToTranslate.isAlreadyCorrectlyTranslated = isAlreadyCorrectlyTranslated;
             propertiesToTranslate.add(propertyToTranslate);
+
+            if (targetWrapper.getOriginal().contains("THROWUPRIGHTNOW49e43jwsdsg")) {
+                throw new IllegalStateException("THROWUPRIGHTNOW49e43jwsdsg requested for " + sourceResource.getPath());
+            }
         }
         for (Resource child : resource.getChildren()) {
             if (!PATTERN_IGNORED_SUBNODE_NAMES.matcher(child.getName()).matches()) {
diff --git a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateCaConfig.java b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateCaConfig.java
index 02f7096f1..96ae1fd7d 100644
--- a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateCaConfig.java
+++ b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateCaConfig.java
@@ -9,8 +9,8 @@
 // is also added to Sling-ContextAware-Configuration-Classes bnd header in pom.xml
 public @interface AutoTranslateCaConfig {
 
-    @Property(label = "Additional Instructions", order = 1,
-            description = "Additional instructions for the automatic translation.")
+    @Property(label = "Additional Instructions (Deprecated)", order = 1,
+            description = "Additional instructions for the automatic translation. Deprecated, please use 'Rules for additional Instructions' instead - if you do not give a path regex nor a content pattern the instructions will be used everywhere.")
     String additionalInstructions();
 
     @Property(label = "Rules for additional Instructions", order = 2,
@@ -57,4 +57,16 @@
             })
     String includeExistingTranslationsInRetranslation();
 
+    @Property(label = "Optional Comment (for documentation, not used by AI)", order = 7,
+            description = "An optional comment about the configuration, for documentation purposes (not used by the translation).",
+            property = {
+                    "widgetType=textarea",
+                    "textareaRows=2"
+            })
+    String comment();
+
+    @Property(label = "Temperature", order = 8,
+            description = "Optional temperature setting that determines variability and creativity as a floating point between 0.0 and 1.0")
+    String temperature();
+
 }
diff --git a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateListModel.java b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateListModel.java
index 44b1c5798..f23faeee6 100644
--- a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateListModel.java
+++ b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateListModel.java
@@ -12,6 +12,7 @@
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.models.annotations.Model;
 import org.apache.sling.models.annotations.injectorspecific.OSGiService;
 import org.apache.sling.models.annotations.injectorspecific.Self;
@@ -19,7 +20,10 @@
 import org.slf4j.LoggerFactory;
 
 import com.composum.ai.backend.slingbase.AIConfigurationService;
+import com.day.cq.wcm.api.Page;
+import com.day.cq.wcm.api.PageManager;
 import com.day.cq.wcm.api.WCMException;
+import com.day.cq.wcm.msm.api.LiveRelationshipManager;
 
 @Model(adaptables = SlingHttpServletRequest.class)
 public class AutoTranslateListModel {
@@ -35,6 +39,9 @@ public class AutoTranslateListModel {
     @OSGiService
     private AutoTranslateConfigService autoTranslateConfigService;
 
+    @OSGiService
+    private LiveRelationshipManager liveRelationshipManager;
+
     @Self
     private SlingHttpServletRequest request;
 
@@ -55,7 +62,7 @@ public boolean inProgress() {
         return runs.stream().filter(run -> run.isInProgress()).findAny().isPresent();
     }
 
-    public AutoTranslateService.TranslationRun createRun() throws LoginException, PersistenceException {
+    public AutoTranslateService.TranslationRun createRun() throws LoginException, PersistenceException, WCMException {
         if (run == null) {
             String path = request.getParameter("path");
             if (path == null || path.isEmpty()) {
@@ -64,6 +71,7 @@ public AutoTranslateService.TranslationRun createRun() throws LoginException, Pe
             path = path.replaceAll("_jcr_content", "jcr:content").replaceAll("\\.html$", "").trim();
             boolean recursive = request.getParameter("recursive") != null;
             boolean changed = request.getParameter("translateWhenChanged") != null;
+            boolean copyOriginalPage = request.getParameter("copyOriginalPage") != null;
             String additionalInstructions = request.getParameter("additionalInstructions");
             boolean debugaddinstructions = request.getParameter("debugaddinstructions") != null;
             if (debugaddinstructions) {
@@ -93,11 +101,48 @@ public AutoTranslateService.TranslationRun createRun() throws LoginException, Pe
             parms.translateWhenChanged = changed;
             parms.additionalInstructions = additionalInstructions;
             parms.breakInheritance = breakInheritance;
+            if (copyOriginalPage) {
+                copyOriginalPage(request, path);
+            }
             run = autoTranslateService.startTranslation(request.getResourceResolver(), path, parms);
         }
         return run;
     }
 
+    /**
+     * If parameter copyOriginalPage is set, we create a copy of the original page with this suffix
+     * before doing the translation.
+     */
+    public static final String SUFFIX_TRANSLATECOPY = "_aitranslate_bak";
+
+    /**
+     * Make a copy of the original page for comparison purposes.
+     */
+    protected void copyOriginalPage(SlingHttpServletRequest request, String path) throws WCMException, PersistenceException {
+        ResourceResolver resolver = request.getResourceResolver();
+        PageManager pageManager = resolver.adaptTo(PageManager.class);
+        Page originalPage = pageManager.getContainingPage(path);
+        path = originalPage.getPath();
+        if (originalPage != null) {
+            String newPath = path + SUFFIX_TRANSLATECOPY;
+            if (resolver.getResource(newPath) != null) {
+                resolver.delete(resolver.getResource(newPath));
+            }
+            Page copy = pageManager.copy(originalPage, newPath, null, true, true, false);
+            if (copy != null) {
+                liveRelationshipManager.endRelationship(copy.getContentResource(), true);
+                liveRelationshipManager.detach(copy.getContentResource(), true); // end doesn't seem to work
+                LOG.info("Created copy of {} at {}", originalPage.getPath(), newPath);
+                resolver.commit();
+            } else {
+                LOG.error("Failed to create copy of {} at {}", originalPage.getPath(), newPath);
+                throw new IllegalArgumentException("Failed to create copy of " + originalPage.getPageTitle() + " at " + newPath);
+            }
+        } else {
+            throw new IllegalArgumentException("No page exists at " + path);
+        }
+    }
+
     public String rollback() throws WCMException, PersistenceException {
         String path = request.getParameter("path");
         try {
diff --git a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateRuleConfig.java b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateRuleConfig.java
index 32c965ed6..19204fba5 100644
--- a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateRuleConfig.java
+++ b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateRuleConfig.java
@@ -10,7 +10,7 @@
 public @interface AutoTranslateRuleConfig {
 
     @Property(label = "Path Regex", order = 1,
-            description = "A regular expression matching the absolute path to the page. " +
+            description = "A regular expression matching the absolute path to the page, incl. jcr:content. " +
                     "E.g. .*/home/products/.* will match all pages under .../home/products/. If empty every page will match" +
                     "if the content pattern condition is met.")
     String pathRegex();
@@ -30,4 +30,12 @@
             })
     String additionalInstructions();
 
+    @Property(label = "Optional Comment (for documentation, not used by AI)", order = 4,
+            description = "An optional comment for the rule, for documentation purposes (not used by the translation).",
+            property = {
+                    "widgetType=textarea",
+                    "textareaRows=2"
+            })
+    String comment();
+
 }
diff --git a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateService.java b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateService.java
index fe08813ef..74628c235 100644
--- a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateService.java
+++ b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateService.java
@@ -159,6 +159,8 @@ abstract class TranslationPage {
                 Pattern.compile("\\.(png|jpg|jpeg|gif|svg|mp3|mov|mp4)(/|$)", Pattern.CASE_INSENSITIVE);
 
         public String pagePath;
+        public String translateCopyPagePath;
+
         public String status;
         public AutoPageTranslateService.Stats stats;
 
@@ -172,6 +174,17 @@ public String editorUrl() {
                 return "/editor.html" + pagePath + ".html";
             }
         }
+
+        /** If a translate copy is present, this would open a diff view. */
+        public String diffToCopyUrl() {
+            if (startsWith(pagePath, "/content/dam") || translateCopyPagePath == null) {
+                return null;
+            } else {
+                return "/mnt/overlay/wcm/core/content/sites/diffresources.html" + pagePath +
+                        "?item=" + translateCopyPagePath + "&sideBySide";
+            }
+        }
+
     }
 
 }
diff --git a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateServiceImpl.java b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateServiceImpl.java
index 2eb0fa4ed..7e8bd8dc0 100644
--- a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateServiceImpl.java
+++ b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/AutoTranslateServiceImpl.java
@@ -1,6 +1,10 @@
 package com.composum.ai.aem.core.impl.autotranslate;
 
+import static com.composum.ai.aem.core.impl.autotranslate.AITranslatePropertyWrapper.AI_TRANSLATION_ERRORMARKER;
+import static org.apache.commons.lang3.StringUtils.startsWith;
+
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -10,6 +14,7 @@
 import javax.annotation.Nonnull;
 
 import org.apache.sling.api.resource.LoginException;
+import org.apache.sling.api.resource.ModifiableValueMap;
 import org.apache.sling.api.resource.PersistenceException;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
@@ -131,9 +136,10 @@ public TranslationRun startTranslation(
         TranslationRunImpl run = new TranslationRunImpl();
         run.id = "" + Math.abs(System.nanoTime());
         run.rootPath = path;
-        run.translationParameters = translationParameters;
+        run.translationParameters = translationParameters.clone();
+        run.translationParameters.autoSave = true; // otherwise it'll be just rolled back
         run.translatedPages = resources.stream()
-                .map(r -> new TranslationPageImpl(r.getPath()))
+                .map(r -> new TranslationPageImpl(r))
                 .collect(Collectors.toList());
         run.waituntil = System.currentTimeMillis() + 1000; // when triggered during live copy creation.
         run.status = TranslationStatus.QUEUED;
@@ -144,7 +150,7 @@ public TranslationRun startTranslation(
     }
 
     protected List<Resource> collectPages(Resource root, int maxDepth) {
-        if (maxDepth < 0) {
+        if (maxDepth < 0 || root.getName().endsWith(AutoTranslateListModel.SUFFIX_TRANSLATECOPY)) {
             return Collections.emptyList();
         }
         if (root.getPath().contains("/jcr:content")) {
@@ -233,10 +239,21 @@ public void execute(ResourceResolver callResourceResolver) {
                         resourceResolver.revert();
                         resourceResolver.refresh();
                         Resource resource = resourceResolver.getResource(page.resourcePath);
-                        if (resource != null) {
-                            AutoPageTranslateService.Stats stats = pageTranslateService.translateLiveCopy(resource, translationParameters);
-                            page.stats = stats;
-                            page.status = stats.hasChanges() ? "done" : "unchanged";
+                        try {
+                            if (resource != null) {
+                                AutoPageTranslateService.Stats stats = pageTranslateService.translateLiveCopy(resource, translationParameters);
+                                page.stats = stats;
+                                page.status = stats.hasChanges() ? "done" : "unchanged";
+                            }
+                        } catch (GPTException.GPTUserNotificationException e) {
+                            throw e;
+                        } catch (Exception e) {
+                            resourceResolver.revert();
+                            resourceResolver.refresh();
+                            // mark translation as failed.
+                            resource.adaptTo(ModifiableValueMap.class).put(AI_TRANSLATION_ERRORMARKER, Calendar.getInstance());
+                            resourceResolver.commit();
+                            throw e;
                         }
                     } catch (GPTException.GPTUserNotificationException e) {
                         page.status = "cancelled - user notification";
@@ -273,11 +290,15 @@ public void execute(ResourceResolver callResourceResolver) {
     public static class TranslationPageImpl extends TranslationPage {
         String resourcePath;
 
-        public TranslationPageImpl(String resourcePath) {
-            this.resourcePath = resourcePath;
+        public TranslationPageImpl(Resource resource) {
+            this.resourcePath = resource.getPath();
             pagePath = ResourceUtil.getParent(resourcePath); // remove jcr:content
             this.status = "queued";
+            Resource translateCopyResource = resource.getParent().getParent()
+                    .getChild(resource.getParent().getName() + AutoTranslateListModel.SUFFIX_TRANSLATECOPY);
+            translateCopyPagePath = translateCopyResource != null ? translateCopyResource.getPath() : null;
         }
+
     }
 
 }
diff --git a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/rollout/AutoTranslateLiveActionImpl.java b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/rollout/AutoTranslateLiveActionImpl.java
index b09b1e30a..81cd85ffd 100644
--- a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/rollout/AutoTranslateLiveActionImpl.java
+++ b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/rollout/AutoTranslateLiveActionImpl.java
@@ -1,10 +1,16 @@
 package com.composum.ai.aem.core.impl.autotranslate.rollout;
 
 
+import static com.composum.ai.aem.core.impl.autotranslate.AITranslatePropertyWrapper.AI_TRANSLATION_ERRORMARKER;
+
+import java.util.Calendar;
+
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 
+import org.apache.sling.api.resource.ModifiableValueMap;
 import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ValueMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,6 +18,7 @@
 import com.composum.ai.aem.core.impl.autotranslate.AutoPageTranslateService;
 import com.composum.ai.aem.core.impl.autotranslate.AutoTranslateService;
 import com.composum.ai.backend.slingbase.AIConfigurationService;
+import com.day.cq.wcm.api.WCMException;
 import com.day.cq.wcm.msm.api.LiveAction;
 import com.day.cq.wcm.msm.api.LiveRelationship;
 import com.day.cq.wcm.msm.commons.BaseAction;
@@ -58,7 +65,7 @@ protected boolean handles(Resource source, Resource target, LiveRelationship rel
     }
 
     @Override
-    protected void doExecute(Resource source, Resource target, LiveRelationship liveRelationship, boolean autoSave) {
+    protected void doExecute(Resource source, Resource target, LiveRelationship liveRelationship, boolean autoSave) throws WCMException {
         String id = (Math.abs(Math.random()) + "").substring(2, 8);
         LOG.info(">>>{} doExecute({}, {}, {})", id, liveRelationship.getSourcePath(), liveRelationship.getTargetPath(), autoSave);
         AutoTranslateService.TranslationParameters parms = new AutoTranslateService.TranslationParameters();
@@ -80,13 +87,28 @@ protected void doExecute(Resource source, Resource target, LiveRelationship live
             } else {
                 autoPageTranslateService.translateLiveCopy(target, parms);
             }
-//        } catch (PersistenceException | RuntimeException | LoginException e) {
-//            throw new WCMException("Error translating " + source.getPath() + "\n" + e, e);
-        } catch (Exception e) { // rather log exception for now since a demo is coming...
+       } catch (Exception e) {
+            // Throwing an exception here will abort a whole recursive rollout, which is a problem.
+            // So we rather mark failures (which should be infrequent) so that they are easy to find.
             LOG.error("Error translating " + source.getPath(), e);
+            markAsError(target);
         } finally {
             LOG.info("<<<{} doExecute({}, {}, {})", id, liveRelationship.getSourcePath(), liveRelationship.getTargetPath(), autoSave);
         }
     }
 
+    /** Make it easy to find pages with errors by marking page with AI_TRANSLATION_ERRORMARKER. */
+    protected static void markAsError(Resource target) {
+        Calendar date = Calendar.getInstance();
+        try (ResourceResolver nestedResolver = target.getResourceResolver().clone(null)) {
+            // use a copy of the resolver since that somehow doesn't work with the original resolver
+            Resource targetNested = nestedResolver.getResource(target.getPath());
+            targetNested.adaptTo(ModifiableValueMap.class).put(AI_TRANSLATION_ERRORMARKER, date);
+            nestedResolver.commit();
+            target.getResourceResolver().refresh();
+        } catch (Exception e) {
+            LOG.warn("Error marking " + target.getPath() + " as error", e);
+        }
+    }
+
 }
diff --git a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/workflow/AutoTranslateWorkflowProcess.java b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/workflow/AutoTranslateWorkflowProcess.java
index a51a3133b..075e87b0a 100644
--- a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/workflow/AutoTranslateWorkflowProcess.java
+++ b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/workflow/AutoTranslateWorkflowProcess.java
@@ -23,6 +23,7 @@
 import com.adobe.granite.workflow.metadata.MetaDataMap;
 import com.composum.ai.aem.core.impl.autotranslate.AutoPageTranslateService;
 import com.composum.ai.aem.core.impl.autotranslate.AutoTranslateConfigService;
+import com.composum.ai.aem.core.impl.autotranslate.AutoTranslateListModel;
 import com.composum.ai.aem.core.impl.autotranslate.AutoTranslateService.TranslationParameters;
 import com.day.cq.wcm.api.WCMException;
 import com.google.gson.Gson;
@@ -146,7 +147,8 @@ protected void translate(@Nonnull Resource resource, TranslationParameters parms
             while (childIterator.hasNext()) {
                 Resource child = childIterator.next();
                 // skip jcr:content node since that has been translated already
-                if (!child.getPath().contains("/jcr:content")) {
+                if (!child.getPath().contains("/jcr:content") &&
+                        !child.getName().endsWith(AutoTranslateListModel.SUFFIX_TRANSLATECOPY)) {
                     translate(child, parms, depth + 1);
                 }
             }
diff --git a/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/workflow/PageTemplatingWorkflowProcess.java b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/workflow/PageTemplatingWorkflowProcess.java
new file mode 100644
index 000000000..d3db15cb2
--- /dev/null
+++ b/aem/core/src/main/java/com/composum/ai/aem/core/impl/autotranslate/workflow/PageTemplatingWorkflowProcess.java
@@ -0,0 +1,91 @@
+package com.composum.ai.aem.core.impl.autotranslate.workflow;
+
+import static com.adobe.granite.workflow.PayloadMap.TYPE_JCR_PATH;
+
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.service.component.annotations.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.adobe.granite.workflow.WorkflowException;
+import com.adobe.granite.workflow.WorkflowSession;
+import com.adobe.granite.workflow.exec.WorkItem;
+import com.adobe.granite.workflow.exec.WorkflowData;
+import com.adobe.granite.workflow.exec.WorkflowProcess;
+import com.adobe.granite.workflow.metadata.MetaDataMap;
+import com.adobe.granite.workflow.model.ValidationException;
+import com.composum.ai.backend.slingbase.experimential.AITemplatingService;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
+
+/**
+ * Triggers a call of the {@link AITemplatingService} on the current page.
+ * If parameter "reset" is given, it does a resetToPrompts instead.
+ * As process arguments it can be given a json {"reset":true} to reset the page to prompts.
+ * The URL as source needs to be in the page somewhere.
+ *
+ * @see "https://ai.composum.com/aiPageTemplating.html"
+ */
+public class PageTemplatingWorkflowProcess implements WorkflowProcess {
+
+    private static final Logger LOG = LoggerFactory.getLogger(PageTemplatingWorkflowProcess.class);
+
+    @Reference
+    protected AITemplatingService aiTemplatingService;
+
+    protected final Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+
+    @Override
+    public void execute(WorkItem workItem, WorkflowSession workflowSession, MetaDataMap metaDataMap) throws WorkflowException {
+        String path = null;
+        try (ResourceResolver resourceResolver = workflowSession.adaptTo(ResourceResolver.class)) {
+            WorkflowData workflowData = workItem.getWorkflowData();
+            if (workflowData.getPayloadType().equals(TYPE_JCR_PATH)) {
+                path = workflowData.getPayload().toString();
+                if (path == null || !path.startsWith("/content/")) {
+                    LOG.error("Workflow started with wrong payload path {}", path);
+                    throw new IllegalArgumentException("Workflow started with wrong payload path: " + path);
+                }
+                Resource resource = resourceResolver.getResource(path);
+                if (resource != null) {
+                    if (isReset(workItem, metaDataMap)) {
+                        aiTemplatingService.resetToPrompts(resource);
+                    } else {
+                        aiTemplatingService.replacePromptsInResource(resource, null, null, null);
+                    }
+                } else {
+                    LOG.error("Autotranslate workflow started with wrong payload path - no resource found: {}", path);
+                }
+            } else {
+                LOG.error("Autotranslate workflow started with wrong payload type: {}", workflowData.getPayloadType());
+            }
+
+        } catch (Exception e) {
+            LOG.error("Failed to process page templating for {}", path, e);
+            throw new WorkflowException("Failed to process page templating for " + path, e);
+        }
+    }
+
+
+    protected boolean isReset(WorkItem workItem, MetaDataMap metaDataMap) throws WorkflowException {
+        Object payload = workItem.getWorkflowData().getPayload();
+        String processArguments = metaDataMap.get("PROCESS_ARGS", String.class); // e.g. {"reset":true}
+        LOG.info("TriggerRollout workflow receiver {} , args {}", payload, processArguments);
+        if (StringUtils.isNotBlank(processArguments)) {
+            try {
+                Map parameters = gson.fromJson(processArguments, Map.class);
+                return parameters.containsKey("reset") && (Boolean) parameters.get("reset");
+            } catch (JsonSyntaxException | ClassCastException | IllegalArgumentException e) {
+                LOG.error("Failed to parse process arguments: {} , ", processArguments, e);
+                throw new ValidationException("Failed to parse process arguments " + processArguments, e);
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/list/.content.xml b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/list/.content.xml
index a059532c3..367fc1a00 100644
--- a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/list/.content.xml
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/list/.content.xml
@@ -2,4 +2,4 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
           xmlns:jcr="http://www.jcp.org/jcr/1.0"
           jcr:primaryType="sling:Folder"
-          sling:resourceType="composum-ai/components/autotranslate/list"/>
+          sling:resourceType="composum-ai/components/autotranslate-experiments/list"/>
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/list/list.html b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/list/list.html
index e108437d4..379e55962 100644
--- a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/list/list.html
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/list/list.html
@@ -87,6 +87,11 @@
                                                 <label for="debugaddinstructions">Instead of translating collect additional instructions for verification</label>
                                             </coral-checkbox>
                                         </div>
+                                        <div class="coral-Form-fieldwrapper">
+                                            <coral-checkbox name="copyOriginalPage">
+                                                <label for="debugaddinstructions">Make a _aitranslate_bak copy of the page before triggering the translation. (Caution: overwrites previous copy, if there is one.)</label>
+                                            </coral-checkbox>
+                                        </div>
                                         <!-- a text area with additional system instructions. -->
                                         <div class="coral-Form-fieldwrapper">
                                             <label class="coral-Form-fieldlabel" for="additionalInstructions">Optionally,
@@ -180,8 +185,9 @@
 <sly data-sly-call="${clientLib.js @ categories='coralui3,granite.ui.foundation.content'}"></sly>
 <script>
     $(document).ready(function () {
-        // save all data to local storage on form submit
         const localStorageKey = 'composum-ai-translation-experimental-ui-data';
+
+        // save all data to local storage on form submit
         $('form').submit(function (event) {
             event.preventDefault();
             const form = $(this);
@@ -189,6 +195,10 @@
                 obj[item.name] = item.value;
                 return obj;
             }, {});
+            form.find('input[type="checkbox"]').each(function () {
+                const field = $(this);
+                formData[field.attr('name')] = field.prop('checked');
+            });
             localStorage.setItem(localStorageKey, JSON.stringify(formData));
             form[0].submit();
         });
@@ -201,6 +211,10 @@
                 const field = $(this);
                 field.val(formData[field.attr('name')] || '');
             });
+            form.find('input[type="checkbox"]').each(function () {
+                const field = $(this);
+                field.prop('checked', formData[field.attr('name')] || false);
+            });
         });
 
         // reset form clears all forms *and* saved data
@@ -210,6 +224,10 @@
                 const field = $(this);
                 field.val('');
             });
+            $(document).find('input[type="checkbox"]').each(function () {
+                const field = $(this);
+                field.prop('checked', false);
+            });
             localStorage.removeItem(localStorageKey);
             $('#maxdepth').val('2');
         });
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/run/.content.xml b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/run/.content.xml
index 52505a43f..7798c88ad 100644
--- a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/run/.content.xml
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/run/.content.xml
@@ -2,4 +2,4 @@
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
           xmlns:jcr="http://www.jcp.org/jcr/1.0"
           jcr:primaryType="sling:Folder"
-          sling:resourceType="composum-ai/components/autotranslate/run"/>
+          sling:resourceType="composum-ai/components/autotranslate-experiments/run"/>
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/run/run.html b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/run/run.html
index 1c95ca6ca..8c59e2418 100644
--- a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/run/run.html
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate-experiments/run/run.html
@@ -92,6 +92,9 @@
                                                    target="_blank"
                                                    href="${item.editorUrl}">${item.pagePath}
                                                 </a>
+                                                &nbsp;
+                                                <a target="_blank" data-sly-test="${item.diffToCopyUrl}"
+                                                   href="${item.diffToCopyUrl}">[diff to copy]</a>
                                             </td>
                                         </tr>
                                         </tbody>
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate/list/list.html b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate/list/list.html
index 859b2bdd7..d9384559e 100644
--- a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate/list/list.html
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate/list/list.html
@@ -73,6 +73,11 @@
                                                 <label for="debugaddinstructions">Instead of translating collect additional instructions for verification</label>
                                             </coral-checkbox>
                                         </div>
+                                        <div class="coral-Form-fieldwrapper">
+                                            <coral-checkbox name="copyOriginalPage">
+                                                <label for="debugaddinstructions">Make a _aitranslate_bak copy of the page before triggering the translation. (Caution: overwrites previous copy, if there is one.)</label>
+                                            </coral-checkbox>
+                                        </div>
                                         <button type="submit" class="coral-Button coral-Button--primary">
                                             Start Translation Process
                                         </button>
@@ -108,7 +113,7 @@
                                 </section>
                                 <hr>
                                 <section>
-                                    Drag this bookmarklet to your bookmark bar to easily open this UI from any page:
+                                    Drag this bookmarklet to your bookmark bar to easily open this UI with the path from any page or editor:
                                     <a id="bookmarklet">Translation Tester</a>
                                 </section>
                             </div>
@@ -132,7 +137,11 @@
                 obj[item.name] = item.value;
                 return obj;
             }, {});
-            localStorage.setItem('composum-ai-translation-experimental-ui-data', JSON.stringify(formData));
+            form.find('input[type="checkbox"]').each(function () {
+                const field = $(this);
+                formData[field.attr('name')] = field.prop('checked');
+            });
+            localStorage.setItem(localStorageKey, JSON.stringify(formData));
             form[0].submit();
         });
 
@@ -144,6 +153,10 @@
                 const field = $(this);
                 field.val(formData[field.attr('name')] || '');
             });
+            form.find('input[type="checkbox"]').each(function () {
+                const field = $(this);
+                field.prop('checked', formData[field.attr('name')] || false);
+            });
         });
 
         // reset form clears all forms *and* saved data
@@ -153,6 +166,10 @@
                 const field = $(this);
                 field.val('');
             });
+            $(document).find('input[type="checkbox"]').each(function () {
+                const field = $(this);
+                field.prop('checked', false);
+            });
             localStorage.removeItem(localStorageKey);
             $('#maxdepth').val('2');
         });
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate/run/run.html b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate/run/run.html
index 8118b246d..814db5779 100644
--- a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate/run/run.html
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/autotranslate/run/run.html
@@ -91,6 +91,9 @@
                                                    target="_blank"
                                                    href="${item.editorUrl}">${item.pagePath}
                                                 </a>
+                                                &nbsp;
+                                                <a target="_blank" data-sly-test="${item.diffToCopyUrl}"
+                                                   href="${item.diffToCopyUrl}">[diff to copy]</a>
                                             </td>
                                         </tr>
                                         </tbody>
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/.content.xml b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/.content.xml
new file mode 100644
index 000000000..f1e1885eb
--- /dev/null
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0"
+          xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+          sling:resourceType="composum-ai/components/tool/comparetool"
+          jcr:primaryType="sling:Folder">
+</jcr:root>
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/comparetool.html b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/comparetool.html
new file mode 100644
index 000000000..3aa92c8c3
--- /dev/null
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/comparetool.html
@@ -0,0 +1,160 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Compare Tool</title>
+    <style>
+        body {
+            display: flex;
+            margin: 0;
+            height: 100vh;
+        }
+
+        .iframe-container {
+            width: 50%;
+            display: flex;
+            flex-direction: column;
+        }
+
+        .url-field {
+            width: 100%;
+            box-sizing: border-box;
+            padding: 8px;
+            font-size: 16px;
+            border: 1px solid #ccc;
+        }
+
+        iframe {
+            width: 100%;
+            height: calc(100% - 40px); /* Adjust based on input field height */
+            border: none;
+        }
+    </style>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/dompurify/3.2.0/purify.min.js" integrity="sha512-AFNgsjnDsfr0u42G9O1u+r+XewdzK7zUIgenHJ4ZbklTMzFgHZ81xmtNSkbDt/SARHrTwfCP1Vec9T7fr7WrMA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+</head>
+<body>
+<div class="iframe-container">
+    <input class="url-field" type="text" placeholder="Enter URL for left iframe"
+           title="Enter the URL to load in the left iframe.">
+    <iframe id="leftIframe" src="" title="Left iframe for comparison."></iframe>
+</div>
+<div class="iframe-container">
+    <input class="url-field" type="text" placeholder="Enter URL for right iframe"
+           title="Enter the URL to load in the right iframe.">
+    <iframe id="rightIframe" src="" title="Right iframe for comparison."></iframe>
+</div>
+<script>
+    // Get references to the iframes and URL input fields
+    const leftIframe = document.getElementById('leftIframe');
+    const rightIframe = document.getElementById('rightIframe');
+    const leftField = document.querySelectorAll('.url-field')[0];
+    const rightField = document.querySelectorAll('.url-field')[1];
+
+    // Flags to track iframes' load status
+    let leftLoaded = false;
+    let rightLoaded = false;
+
+    // Flags to prevent infinite scroll loops
+    let isLeftScrolling = false;
+    let isRightScrolling = false;
+
+    // Event listeners for URL input fields
+    leftField.addEventListener('change', function () {
+        leftLoaded = false;
+        try {
+            const url = new URL(this.value);
+            leftIframe.src = DOMPurify.sanitize(url.href);
+        } catch (e) {
+            console.error('Invalid URL:', this.value);
+        }
+    });
+
+    rightField.addEventListener('change', function () {
+        rightLoaded = false;
+        try {
+            const url = new URL(this.value);
+            rightIframe.src = DOMPurify.sanitize(url.href);
+        } catch (e) {
+            console.error('Invalid URL:', this.value);
+        }
+    });
+
+    // Function to parse URL parameters
+    function getParameterByName(name) {
+        const url = new URL(window.location.href);
+        return url.searchParams.get(name);
+    }
+
+    // Load the initial URLs if available in the parameters
+    const initialUrl1 = getParameterByName('url1');
+    const initialUrl2 = getParameterByName('url2');
+    if (initialUrl1) {
+        leftIframe.src = DOMPurify.sanitize(initialUrl1);
+        leftField.value = initialUrl1;
+    }
+    if (initialUrl2) {
+        rightIframe.src = DOMPurify.sanitize(initialUrl2);
+        rightField.value = initialUrl2;
+    }
+
+    // Load event listeners for iframes
+    leftIframe.addEventListener('load', function () {
+        leftLoaded = true;
+        if (leftLoaded && rightLoaded) {
+            syncScroll();
+        }
+    });
+
+    rightIframe.addEventListener('load', function () {
+        rightLoaded = true;
+        if (leftLoaded && rightLoaded) {
+            syncScroll();
+        }
+    });
+
+    // Function to synchronize scrolling
+    function syncScroll() {
+        if (leftIframe.contentWindow && rightIframe.contentWindow) {
+            const leftWindow = leftIframe.contentWindow;
+            const rightWindow = rightIframe.contentWindow;
+
+            // Remove existing event listeners to prevent multiple bindings
+            leftWindow.removeEventListener('scroll', onLeftScroll);
+            rightWindow.removeEventListener('scroll', onRightScroll);
+
+            // Add new scroll event listeners
+            leftWindow.addEventListener('scroll', onLeftScroll);
+            rightWindow.addEventListener('scroll', onRightScroll);
+        }
+    }
+
+    // Scroll event handler for left iframe
+    function onLeftScroll() {
+        if (isLeftScrolling) {
+            isLeftScrolling = false;
+            return;
+        }
+        isRightScrolling = true;
+        const leftWindow = leftIframe.contentWindow;
+        const rightWindow = rightIframe.contentWindow;
+
+        const scrollPercent = leftWindow.scrollY / (leftWindow.document.documentElement.scrollHeight - leftWindow.innerHeight);
+        rightWindow.scrollTo(0, scrollPercent * (rightWindow.document.documentElement.scrollHeight - rightWindow.innerHeight));
+    }
+
+    // Scroll event handler for right iframe
+    function onRightScroll() {
+        if (isRightScrolling) {
+            isRightScrolling = false;
+            return;
+        }
+        isLeftScrolling = true;
+        const leftWindow = leftIframe.contentWindow;
+        const rightWindow = rightIframe.contentWindow;
+
+        const scrollPercent = rightWindow.scrollY / (rightWindow.document.documentElement.scrollHeight - rightWindow.innerHeight);
+        leftWindow.scrollTo(0, scrollPercent * (leftWindow.document.documentElement.scrollHeight - leftWindow.innerHeight));
+    }
+</script>
+</body>
+</html>
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/comparetool.md b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/comparetool.md
new file mode 100644
index 000000000..ed545d267
--- /dev/null
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/comparetool/comparetool.md
@@ -0,0 +1,48 @@
+# Compare Tool Specification
+
+## Overview
+
+This document outlines the specifications for a single-page HTML application named `comparetool.html`. The application
+will display two web pages side by side, allowing for an efficient comparison.
+
+## Features
+
+1. **Two Iframes Side by Side**: The application will consist of two iframes, each occupying 50% of the browser width
+   and the full height of the window.
+
+2. **URL Fields**: Each iframe will have a dedicated URL field above it for users to input the URLs they want displayed
+   within the iframes.
+
+3. **Synchronized Scrolling**: If one iframe is scrolled, the other iframe will scroll in proportion. For instance, if
+   the left iframe is scrolled to 42%, the right iframe will also scroll to 42%.
+
+4. **Parameters**: the URL parameters passed to the application are:
+   - `url1`: the URL that is initially loaded into the left iframe
+   - `url2`: the URL that is initially loaded into the right iframe
+
+The tool is meant to be run in a desktop browser, no responsive design necessary.
+
+## Implementation Details
+
+- **HTML Structure**: The HTML will consist of two main sections, each containing an iframe and a URL input field.
+- **CSS Styling**: The iframes will be styled to take up 50% of the width and 100% height of the viewport.
+- **JavaScript Functionality**: A script will be implemented to handle the synchronization of scrolling between the two
+  iframes.
+
+## Conclusion
+
+The `comparetool.html` application is designed to provide users with an efficient means of comparing two web pages side
+by side. With synchronized scrolling and dedicated URL fields, users can easily navigate and assess differences between
+the two sources.
+
+## TODOs / ideas
+
+- if url1/url2 are changed, the location needs to be updated (push state!)
+- url1/url2 should set the fields
+- default url1 to blueprint of url2 ; button to do that
+- styling
+- checkbox to break scroll synchronization
+- shortcut to editor
+- bookmarklet to open comparison
+- help texts
+
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/mergetool/idea.md b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/mergetool/idea.md
new file mode 100644
index 000000000..fe405db7f
--- /dev/null
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/mergetool/idea.md
@@ -0,0 +1,69 @@
+# Merge tool for existing / new translations
+
+## Background
+
+We have an automatical translation of AEM pages. It collects all translateable texts from the source pages
+components and translates them into the target page (a live copy of the source page).
+The texts can be simple text attributes (fields like headlines, titles etc.),
+one or a few paragraphs of plaintext for descriptions etc., and also richtext fields of one or more paragraphs.
+
+In the target page, the translations are normally overwritten when the corresponding field has changed in the source
+page or when the configuration of the translation has changed (incl. some additional instructions that can be given
+for the page). However, if the inheritance of the field or the component with the field is broken, the field remains
+unchanged during the rollout. This is done when translations have to be adapted manually to improve the translations.
+
+## The problem
+
+If a previous version of a source page has already been translated into the target page and now there is a new version
+of the source page, but some inheritances have been broken, the translation process does nothing for these fields.
+However, simply reenabling the inheritance is often not quite desirable, because the translation would be
+overwritten by the new translation and all manually changed content would be lost. So we need a way to merge the
+existing translations with the new translations.
+
+## Idea for a merge tool
+
+### Available information
+
+We store for each field:
+
+- the original text it was translated from
+- the AI translated text
+
+This is used in the translation process so that fields where the original value was not changed are not translated
+again but just keep the same text. (They are however translated anyway if the translation configuration changed).
+
+For fields that have broken inheritance we can also add for the benefit of the merge tool:
+
+- the new text from the source
+- the AI translation of that new text
+
+### UI of the merge tool
+
+The merge tool should list the translated / translateable fields from a page and supply the information the editor
+needs to adapt the translations. (It could either display all fields or just those with cancelled inheritance, or
+just changed fields.) It should have the following columns, with a row for each field:
+
+- current (= new) source text
+- current AI translation
+- mini column without title that contains a ">" button to copy the current AI translation to the new translation
+  field and below that a "<<" button that appends it
+- editable field for the new translation
+- mini column without title that contains a "<" button to copy the current target text to the new translation field
+  and below that a "<<" button that appends it
+- current target text as shown in the page
+
+Optional information that might be shown in some place, but not be prominent:
+
+- component path / field name
+- Link to the source page and target page
+- original source text used for the current target text
+
+General structure:
+
+- Headline "Translation merge tool"
+- Links to the source page and target page
+- A table with a header row and a row for each field. The columns are as described above.
+
+### Mockup
+
+PROMPT: an HTML mockup of the merge tool UI - one HTML page with embedded CSS and Javascript using bootstrap.
diff --git a/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/mergetool/translation-merge-tool-html.htm b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/mergetool/translation-merge-tool-html.htm
new file mode 100644
index 000000000..1ab28ff8d
--- /dev/null
+++ b/aem/ui.apps/src/main/content/jcr_root/apps/composum-ai/components/tool/mergetool/translation-merge-tool-html.htm
@@ -0,0 +1,171 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Translation Merge Tool Mockup (no functionality yet)</title>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/css/bootstrap.min.css" integrity="sha512-jnSuA4Ss2PkkikSOLtYs8BlYIeeIK1h99ty4YfvRPAlzr377vr3CXDb7sb7eEEBYjDtcYj+AjBH3FLv5uSJuXg==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <style>
+        .btn-copy {
+            padding: 0.2rem 0.5rem;
+            font-size: 0.875rem;
+            width: 2.5rem;
+        }
+        .component-path {
+            font-size: 0.75rem;
+            color: #6c757d;
+        }
+        .table td {
+            vertical-align: top;
+            padding-top: 1rem;
+            padding-bottom: 1rem;
+        }
+        .action-buttons {
+            display: flex;
+            flex-direction: column;
+            gap: 0.5rem;
+        }
+        .table {
+            table-layout: fixed;
+        }
+        .table td {
+            word-wrap: break-word;
+        }
+        .btn-column {
+            width: 50px;
+        }
+        .translation-textarea {
+            height: 100%;
+            min-height: 100px;
+            resize: none;
+        }
+    </style>
+</head>
+<body>
+    <div class="container-fluid py-4">
+        <h1 class="mb-4">Translation Merge Tool</h1>
+        
+        <div class="mb-4">
+            <a href="#source" class="btn btn-outline-primary me-2">
+                Source Page <i class="fas fa-external-link-alt ms-1"></i>
+            </a>
+            <a href="#target" class="btn btn-outline-primary">
+                Target Page <i class="fas fa-external-link-alt ms-1"></i>
+            </a>
+        </div>
+
+        <div class="table-responsive">
+            <table class="table table-bordered table-hover">
+                <thead class="table-light">
+                    <tr>
+                        <th>Current Source Text</th>
+                        <th>Current AI Translation</th>
+                        <th class="btn-column"></th>
+                        <th>New Translation</th>
+                        <th class="btn-column"></th>
+                        <th>Current Target Text</th>
+                    </tr>
+                </thead>
+                <tbody id="translationTableBody">
+                    <!-- Table content will be populated by JavaScript -->
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.3.3/js/bootstrap.bundle.min.js" integrity="sha512-7Pi/otdlbbCR+LnW+F7PwFcSDJOuUJB3OxtEHbg4vSMvzvJjde4Po1v4BR9Gdc9aXNUNFVUY+SK51wWT8WF0Gg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+    <script>
+        // Sample translation data
+        const translations = [
+            {
+                id: 1,
+                sourceText: "Welcome to our company",
+                aiTranslation: "Willkommen in unserem Unternehmen",
+                targetText: "Willkommen bei unserer Firma",
+                componentPath: "/content/home/header/title",
+                newTranslation: ""
+            },
+            {
+                id: 2,
+                sourceText: "We provide innovative solutions for modern businesses. Our team of experts works tirelessly to ensure your success in the digital age.",
+                aiTranslation: "Wir bieten innovative Lösungen für moderne Unternehmen. Unser Expertenteam arbeitet unermüdlich daran, Ihren Erfolg im digitalen Zeitalter sicherzustellen.",
+                targetText: "Wir bieten innovative Lösungen für moderne Firmen. Unser Team von Experten arbeitet kontinuierlich an Ihrem Erfolg im digitalen Zeitalter.",
+                componentPath: "/content/home/main/description",
+                newTranslation: ""
+            }
+        ];
+
+        function createTableRow(translation, index) {
+            return `
+                <tr>
+                    <td>
+                        <div>${translation.sourceText}</div>
+                        <div class="component-path mt-1">${translation.componentPath}</div>
+                    </td>
+                    <td>${translation.aiTranslation}</td>
+                    <td class="text-center">
+                        <div class="action-buttons">
+                            <button class="btn btn-primary btn-copy" 
+                                    onclick="handleCopyText(${index}, 'ai')" 
+                                    title="Copy AI translation">
+                                &gt;
+                            </button>
+                            <button class="btn btn-primary btn-copy" 
+                                    onclick="handleAppendText(${index}, 'ai')" 
+                                    title="Append AI translation">
+                                &gt;&gt;
+                            </button>
+                        </div>
+                    </td>
+                    <td>
+                        <textarea class="form-control translation-textarea" 
+                                 id="newTranslation${index}" rows="5"
+                                 oninput="handleInputChange(${index}, this.value)">${translation.newTranslation}</textarea>
+                    </td>
+                    <td class="text-center">
+                        <div class="action-buttons">
+                            <button class="btn btn-primary btn-copy" 
+                                    onclick="handleCopyText(${index}, 'target')" 
+                                    title="Copy current target text">
+                                &lt;
+                            </button>
+                            <button class="btn btn-primary btn-copy" 
+                                    onclick="handleAppendText(${index}, 'target')" 
+                                    title="Append current target text">
+                                &lt;&lt;
+                            </button>
+                        </div>
+                    </td>
+                    <td>${translation.targetText}</td>
+                </tr>
+            `;
+        }
+
+        function renderTable() {
+            const tableBody = document.getElementById('translationTableBody');
+            tableBody.innerHTML = translations.map((t, i) => createTableRow(t, i)).join('');
+        }
+
+        function handleCopyText(index, source) {
+            const text = source === 'ai' ? translations[index].aiTranslation : translations[index].targetText;
+            translations[index].newTranslation = text;
+            document.getElementById(`newTranslation${index}`).value = text;
+        }
+
+        function handleAppendText(index, source) {
+            const text = source === 'ai' ? translations[index].aiTranslation : translations[index].targetText;
+            const currentText = translations[index].newTranslation;
+            const newText = currentText ? `${currentText} ${text}` : text;
+            translations[index].newTranslation = newText;
+            document.getElementById(`newTranslation${index}`).value = newText;
+        }
+
+        function handleInputChange(index, value) {
+            translations[index].newTranslation = value;
+        }
+
+        // Initialize the table
+        document.addEventListener('DOMContentLoaded', renderTable);
+    </script>
+</body>
+</html>
diff --git a/aem/ui.frontend/src/main/webpack/site/SidePanelDialog.js b/aem/ui.frontend/src/main/webpack/site/SidePanelDialog.js
index f3379fedb..e05be7dc8 100644
--- a/aem/ui.frontend/src/main/webpack/site/SidePanelDialog.js
+++ b/aem/ui.frontend/src/main/webpack/site/SidePanelDialog.js
@@ -300,6 +300,7 @@ class SidePanelDialog {
 
     doneCallback(text, event) {
         if (this.debug) console.log("SidePanelDialog doneCallback", arguments);
+        this.addLinksToResponse();
         this.ensurePromptCount(this.$promptContainer.find('.composum-ai-response').length + 1);
         this.$promptContainer.find('.composum-ai-prompt:last').focus();
         console.log("SidePanelDialog doneCallback", arguments);
@@ -316,6 +317,35 @@ class SidePanelDialog {
         this.history.maybeSaveToHistory();
     }
 
+    /** There might be content paths or URLs created by tools in the response. We turn them into clickable anchors. */
+    addLinksToResponse() {
+        const lastResponse = this.$promptContainer.find('.composum-ai-response:last');
+        try {
+            lastResponse.html(lastResponse.html().replace(/(https?:\/\/[^\s<]+|\/?content\/[\w\-\/]+(?:\.html)?)/g, function (match) {
+                if (match.startsWith('http://localhost:4502')) {
+                    match = match.replace('^http://localhost:4502', '');
+                }
+                if (match.startsWith('http://') || match.startsWith('https://')) {
+                    // Handle full URLs
+                    return '<a href="' + match + '" target="_blank">' + match + '</a>';
+                } else if (match.startsWith('/content/') || match.startsWith('content/')) {
+                    // Handle AEM content paths
+                    const editorPathMatch = location.pathname.match(/\/[^.]*\.[^/]*/);
+                    const editorPath = editorPathMatch ? editorPathMatch[0] : '';
+                    var cleanedMatch = match.replace(/\/jcr:content$/, '').replace(/\.html$/, '');
+                    if (cleanedMatch.startsWith('content')) {
+                        cleanedMatch = '/' + cleanedMatch;
+                     }
+                    return '<a href="' + editorPath + cleanedMatch + '.html" target="_blank">' + match + '</a>';
+                } else {
+                    return match;
+                }
+            }));
+        } catch (e) {
+            console.error("addLinksToResponse error for ", lastResponse.html(), e);
+        }
+    }
+
     errorCallback(data) {
         console.error("SidePanelDialog errorCallback", arguments);
         this.showError(data);
diff --git a/backend/base/pom.xml b/backend/base/pom.xml
index e6f4d4453..e5fbecc5e 100644
--- a/backend/base/pom.xml
+++ b/backend/base/pom.xml
@@ -125,7 +125,14 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.tngtech.archunit</groupId>
+            <artifactId>archunit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.tngtech.archunit</groupId>
+            <artifactId>archunit-junit4</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatCompletionService.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatCompletionService.java
index 91bfb3525..f54349737 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatCompletionService.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatCompletionService.java
@@ -6,7 +6,6 @@
 import javax.annotation.Nullable;
 
 import com.composum.ai.backend.base.service.GPTException;
-import com.composum.ai.backend.base.service.chat.impl.GPTChatMessagesTemplate;
 
 /**
  * Raw abstraction of the ChatGPT chat interface, with only the details that are needed.
@@ -30,6 +29,13 @@ public interface GPTChatCompletionService {
      */
     void streamingChatCompletion(@Nonnull GPTChatRequest request, @Nonnull GPTCompletionCallback callback) throws GPTException;
 
+    /**
+     * Give some messages and receive the streaming response via callback, to reduce waiting time.
+     * This implementation also performs tool calls if tools are given in {@link GPTChatRequest#getConfiguration()}.
+     * It possibly waits if a rate limit is reached, but otherwise returns immediately after scheduling an asynchronous call.
+     */
+    void streamingChatCompletionWithToolCalls(@Nonnull GPTChatRequest request, @Nonnull GPTCompletionCallback callback) throws GPTException;
+
     /**
      * Retrieves a (usually cached) chat template with that name. Mostly for backend internal use.
      * The templates are retrieved from the bundle resources at "chattemplates/", and are cached.
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatMessage.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatMessage.java
index 6302d1158..cc852ec63 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatMessage.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatMessage.java
@@ -1,5 +1,6 @@
 package com.composum.ai.backend.base.service.chat;
 
+import java.util.List;
 import java.util.Objects;
 
 import javax.annotation.Nonnull;
@@ -15,17 +16,27 @@ public class GPTChatMessage {
     private final GPTMessageRole role;
     private final String content;
     private final String imageUrl;
+    private final String tool_call_id;
+    private final List<GPTToolCall> tool_calls;
 
     public GPTChatMessage(@Nonnull GPTMessageRole role, @Nonnull String content) {
-        this.role = role;
-        this.content = content;
-        this.imageUrl = null;
+        this(role, content, null);
     }
 
     public GPTChatMessage(@Nonnull GPTMessageRole role, @Nullable String content, @Nullable String imageUrl) {
+        this(role, content, imageUrl, null);
+    }
+
+    public GPTChatMessage(@Nonnull GPTMessageRole role, @Nullable String content, @Nullable String imageUrl, String tool_call_id) {
+        this(role, content, imageUrl, tool_call_id, null);
+    }
+
+    public GPTChatMessage(@Nonnull GPTMessageRole role, @Nullable String content, @Nullable String imageUrl, String tool_call_id, List<GPTToolCall> tool_calls) {
         this.role = role;
         this.content = content;
         this.imageUrl = imageUrl;
+        this.tool_call_id = tool_call_id;
+        this.tool_calls = tool_calls;
     }
 
     /**
@@ -49,6 +60,21 @@ public String getImageUrl() {
         return imageUrl;
     }
 
+    /**
+     * The ID of a prior tool call.
+     */
+    public String getToolCallId() {
+        return tool_call_id;
+    }
+
+    /**
+     * The tool calls that were made in the context of this message.
+     */
+    @Nullable
+    public List<GPTToolCall> getToolCalls() {
+        return tool_calls;
+    }
+
     /**
      * String representation only for debugging.
      */
@@ -58,6 +84,8 @@ public String toString() {
                 "role=" + role +
                 (content != null ? ", text='" + content + '\'' : "") +
                 (imageUrl != null ? ", imageUrl='" + imageUrl + '\'' : "") +
+                (tool_call_id != null ? ", tool_call_id='" + tool_call_id + '\'' : "") +
+                (tool_calls != null ? ", tool_calls=" + tool_calls : "") +
                 '}';
     }
 
@@ -67,7 +95,9 @@ public boolean equals(Object o) {
         if (!(o instanceof GPTChatMessage)) return false;
         GPTChatMessage that = (GPTChatMessage) o;
         return getRole() == that.getRole() && Objects.equals(getContent(), that.getContent()) &&
-                Objects.equals(getImageUrl(), that.getImageUrl());
+                Objects.equals(getImageUrl(), that.getImageUrl()) &&
+                Objects.equals(getToolCallId(),  that.getToolCallId()) &&
+                Objects.equals(getToolCalls(), that.getToolCalls());
     }
 
     @Override
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTChatMessagesTemplate.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatMessagesTemplate.java
similarity index 97%
rename from backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTChatMessagesTemplate.java
rename to backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatMessagesTemplate.java
index 34e10e27d..a19a41b43 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTChatMessagesTemplate.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatMessagesTemplate.java
@@ -1,4 +1,4 @@
-package com.composum.ai.backend.base.service.chat.impl;
+package com.composum.ai.backend.base.service.chat;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -21,8 +21,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.composum.ai.backend.base.service.GPTException;
-import com.composum.ai.backend.base.service.chat.GPTChatMessage;
-import com.composum.ai.backend.base.service.chat.GPTMessageRole;
 
 /**
  * A template for chat messages, with placeholders.
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatRequest.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatRequest.java
index f240d6eb9..39295d073 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatRequest.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTChatRequest.java
@@ -36,6 +36,17 @@ public GPTChatRequest(GPTConfiguration configuration) {
         this.configuration = configuration;
     }
 
+    /**
+     * Returns a copy; the messages list is shallowly copied, but configuration is the same object.
+     */
+    public GPTChatRequest copy() {
+        GPTChatRequest result = new GPTChatRequest();
+        result.messages.addAll(messages);
+        result.maxTokens = maxTokens;
+        result.configuration = configuration;
+        return result;
+    }
+
     /**
      * Builder style adding of messages.
      *
@@ -46,6 +57,16 @@ public GPTChatRequest addMessage(GPTMessageRole role, String content) {
         return this;
     }
 
+    /**
+     * Builder style adding of messages.
+     *
+     * @return this
+     */
+    public GPTChatRequest addMessage(GPTChatMessage message) {
+        messages.add(message);
+        return this;
+    }
+
     /**
      * Builder style adding of messages.
      *
@@ -169,4 +190,5 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(getMessages(), getMaxTokens(), getConfiguration());
     }
+
 }
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTCompletionCallback.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTCompletionCallback.java
index 521f41b77..5d625e90b 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTCompletionCallback.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTCompletionCallback.java
@@ -1,5 +1,9 @@
 package com.composum.ai.backend.base.service.chat;
 
+import java.util.List;
+
+import javax.annotation.Nonnull;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -29,12 +33,86 @@ public interface GPTCompletionCallback {
      */
     void setLoggingId(String loggingId);
 
+    /**
+     * For tool calls: set the context to execute actions in.
+     */
+    default GPTToolExecutionContext getToolExecutionContext() {
+        return null;
+    }
+
     /**
      * For debugging - the request that was sent to ChatGPT as JSON.
      */
     default void setRequest(String json) {
     }
 
+    /**
+     * Notifies that the request is completely finished / closed, nothing more will arrive.
+     */
+    default void close() {
+        // empty
+    }
+
+    /**
+     * Called when a tool call is made.
+     */
+    default void toolDelta(List<GPTToolCall> toolCalls) {
+        // empty
+    }
+
+    /**
+     * For tool calls: context to execute actions in.
+     */
+    public interface GPTToolExecutionContext {
+        // empty here - has to be specifiec in other layers
+    }
+
+    /**
+     * Forwards all methods to a delegate.
+     */
+    public static class GPTCompletionCallbackWrapper implements GPTCompletionCallback {
+
+        @Nonnull
+        protected GPTCompletionCallback delegate;
+
+        public GPTCompletionCallbackWrapper(@Nonnull GPTCompletionCallback delegate) {
+            this.delegate = delegate;
+        }
+
+        public void onFinish(GPTFinishReason finishReason) {
+            delegate.onFinish(finishReason);
+        }
+
+        public void onNext(String chars) {
+            delegate.onNext(chars);
+        }
+
+        public void onError(Throwable throwable) {
+            delegate.onError(throwable);
+        }
+
+        public void setLoggingId(String loggingId) {
+            delegate.setLoggingId(loggingId);
+        }
+
+        public void setRequest(String json) {
+            delegate.setRequest(json);
+        }
+
+        public void close() {
+            delegate.close();
+        }
+
+        public void toolDelta(List<GPTToolCall> toolCalls) {
+            delegate.toolDelta(toolCalls);
+        }
+
+        public GPTToolExecutionContext getToolExecutionContext() {
+            return delegate.getToolExecutionContext();
+        }
+
+    }
+
     /**
      * A simple collector that just takes note of things.
      */
@@ -45,6 +123,7 @@ public static class GPTCompletionCollector implements GPTCompletionCallback {
         private StringBuilder buffer = new StringBuilder();
         private Throwable throwable;
         private GPTFinishReason finishReason;
+        private List<GPTToolCall> toolCalls;
 
         @Override
         public void onFinish(GPTFinishReason finishReason) {
@@ -78,6 +157,21 @@ public String getResult() {
         public Throwable getError() {
             return throwable;
         }
+
+        @Override
+        public void toolDelta(List<GPTToolCall> toolCalls) {
+            this.toolCalls = GPTToolCall.mergeDelta(this.toolCalls, toolCalls);
+        }
+
+        public List<GPTToolCall> getToolCalls() {
+            return toolCalls;
+        }
+
+        @Override
+        public GPTToolExecutionContext getToolExecutionContext() {
+            return null;
+        }
+
     }
 
 }
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTConfiguration.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTConfiguration.java
index de180b806..2c3563e09 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTConfiguration.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTConfiguration.java
@@ -41,6 +41,16 @@ public enum Mode {
         CHAT
     }
 
+//    /** Controls which (if any) tool is called by the model. */
+//    public enum ToolChoice {
+//        /** Do not call a tool, just output a message. */
+//        NONE,
+//        /** Model can pick between generating a message and calling a tool. */
+//        AUTO,
+//        /** Forces calling one or more tools. */
+//        REQUIRED
+//    }
+
     private final String apiKey;
 
     private final String organizationId;
@@ -61,6 +71,8 @@ public enum Mode {
 
     private final List<GPTContextInfo> contexts;
 
+    private final List<GPTTool> tools;
+
 
     public GPTConfiguration(@Nullable String apiKey, @Nullable String organizationId, @Nullable AnswerType answerType) {
         this(apiKey, organizationId, answerType, null);
@@ -91,6 +103,10 @@ public GPTConfiguration(@Nullable String apiKey, @Nullable String organizationId
     }
 
     public GPTConfiguration(@Nullable String apiKey, @Nullable String organizationId, @Nullable AnswerType answerType, @Nullable String additionalInstructions, @Nullable Mode mode, @Nullable Boolean highIntelligenceNeeded, @Nullable Boolean debug, @Nullable Double temperature, @Nullable Integer seed, @Nullable List<GPTContextInfo> contexts) {
+        this(apiKey, organizationId, answerType, additionalInstructions, mode, highIntelligenceNeeded, debug, temperature, seed, contexts, null);
+    }
+
+    public GPTConfiguration(@Nullable String apiKey, @Nullable String organizationId, @Nullable AnswerType answerType, @Nullable String additionalInstructions, @Nullable Mode mode, @Nullable Boolean highIntelligenceNeeded, @Nullable Boolean debug, @Nullable Double temperature, @Nullable Integer seed, @Nullable List<GPTContextInfo> contexts, List<GPTTool> tools) {
         this.apiKey = apiKey;
         this.answerType = answerType;
         this.organizationId = organizationId;
@@ -101,6 +117,7 @@ public GPTConfiguration(@Nullable String apiKey, @Nullable String organizationId
         this.temperature = temperature;
         this.seed = seed;
         this.contexts = contexts;
+        this.tools = tools;
     }
 
     /**
@@ -176,6 +193,13 @@ public Integer getSeed() {
         return seed;
     }
 
+    /**
+     * A list of tools the Model could use.
+     */
+    public List<GPTTool> getTools() {
+        return tools;
+    }
+
     /**
      * Creates a configuration that joins the values.
      *
@@ -228,7 +252,15 @@ public GPTConfiguration merge(@Nullable GPTConfiguration other, boolean override
             contextInfos.addAll(other.contexts);
         }
         contextInfos = contextInfos.isEmpty() ? null : Collections.unmodifiableList(contextInfos);
-        return new GPTConfiguration(apiKey, organizationId, answerType, additionalInstructions, mode, highIntelligenceNeeded, debug, temperature, seed, contextInfos);
+        List<GPTTool> tools = new ArrayList<>();
+        if (this.tools != null) {
+            tools.addAll(this.tools);
+        }
+        if (other.tools != null) {
+            tools.addAll(other.tools);
+        }
+        tools = tools.isEmpty() ? null : Collections.unmodifiableList(tools);
+        return new GPTConfiguration(apiKey, organizationId, answerType, additionalInstructions, mode, highIntelligenceNeeded, debug, temperature, seed, contextInfos, tools);
     }
 
     /**
@@ -276,6 +308,15 @@ public static GPTConfiguration ofContext(@Nonnull String usermsg, @Nonnull Strin
         return ofContexts(Collections.singletonList(new GPTContextInfo(usermsg, assistantmsg)));
     }
 
+    @Nonnull
+    public static GPTConfiguration ofTools(@Nullable List<GPTTool> tools) {
+        return new GPTConfiguration(null, null, null, null, null, null, null, null, null, null, tools);
+    }
+
+    public static GPTConfiguration ofTemperature(Double temperature) {
+        return new GPTConfiguration(null, null, null, null, null, null, null, temperature);
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder("GPTConfiguration{");
@@ -317,6 +358,8 @@ public String toString() {
     public static final GPTConfiguration JSON = new GPTConfiguration(null, null, AnswerType.JSON);
     public static final GPTConfiguration CHAT = new GPTConfiguration(null, null, null, null, Mode.CHAT);
     public static final GPTConfiguration GENERATE = new GPTConfiguration(null, null, null, null, Mode.GENERATE);
+    public static final GPTConfiguration NULLCFG = new GPTConfiguration(null, null, null);
+
     /**
      * Requests slower and more expensive "high intelligence" model - use sparingly.
      */
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTFinishReason.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTFinishReason.java
index 4fef2d30f..e7761dc5f 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTFinishReason.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTFinishReason.java
@@ -17,8 +17,14 @@ public enum GPTFinishReason {
     /**
      * Model decided to call a function.
      */
+    @Deprecated
     FUNCTION_CALL,
 
+    /**
+     * Model decided to call one or more tools.
+     */
+    TOOL_CALLS,
+
     /**
      * Omitted content due to a flag from our content filters.
      */
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTFunctionCallDetails.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTFunctionCallDetails.java
new file mode 100644
index 000000000..057493db3
--- /dev/null
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTFunctionCallDetails.java
@@ -0,0 +1,78 @@
+package com.composum.ai.backend.base.service.chat;
+
+import java.util.Objects;
+
+import javax.annotation.Nullable;
+
+/**
+ * Represents the a call of a function used as a tool in the chat completion request.
+ */
+public class GPTFunctionCallDetails {
+
+    private final String name;
+    private final String arguments;
+
+    /**
+     * Creates the object
+     *
+     * @param name      The name of the function to be called. This must be unique and can only contain a-z, A-Z, 0-9, underscores, and dashes.
+     * @param arguments A JSON for the arguments the function is called with.
+     */
+    public GPTFunctionCallDetails(String name, String arguments) {
+        this.name = name;
+        this.arguments = arguments;
+    }
+
+    /**
+     * The name of the function to be called. This must be unique and can only contain a-z, A-Z, 0-9, underscores, and dashes.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * A JSON for the arguments the function is called with.
+     */
+    public String getArguments() {
+        return arguments;
+    }
+
+    /**
+     * String representation for debugging.
+     */
+    @Override
+    public String toString() {
+        return "{" +
+                "name='" + name + '\'' +
+                ", arguments='" + arguments + '\'' +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof GPTFunctionCallDetails)) return false;
+        GPTFunctionCallDetails that = (GPTFunctionCallDetails) o;
+        return Objects.equals(getName(), that.getName()) && Objects.equals(getArguments(), that.getArguments());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getName(), getArguments());
+    }
+
+    public GPTFunctionCallDetails mergeDelta(@Nullable GPTFunctionCallDetails function) {
+        if (function == null) {
+            return this;
+        }
+        String newName = name == null ? function.name : name;
+        String newArguments = arguments;
+        if (newArguments == null) {
+            newArguments = function.arguments;
+        } else if (function.arguments != null) {
+            newArguments = newArguments + function.arguments;
+        }
+        return new GPTFunctionCallDetails(newName, newArguments);
+    }
+
+}
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTFunctionDetails.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTFunctionDetails.java
new file mode 100644
index 000000000..2e0f1d46c
--- /dev/null
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTFunctionDetails.java
@@ -0,0 +1,58 @@
+package com.composum.ai.backend.base.service.chat;
+
+/**
+ * Represents the details of a function used as a tool in the chat completion request.
+ * Includes the function's name, description, parameters, and an optional strict flag.
+ */
+public class GPTFunctionDetails {
+
+    private final String name;
+    private final String description;
+    private final Object parameters;  // Arbitrary JSON schema
+    private final Boolean strict;
+
+    /**
+     * Creates the object
+     *
+     * @param name        The name of the function to be called. This must be unique and can only contain a-z, A-Z, 0-9, underscores, and dashes.
+     * @param description A brief description of what the function does. Helps the model choose when to call it.
+     *                    The parameters accepted by the function, defined as an arbitrary JSON schema object.
+     * @param parameters  The parameters accepted by the function, defined as an arbitrary JSON schema object.
+     * @param strict      Whether to enforce strict schema adherence for the parameters
+     */
+    public GPTFunctionDetails(String name, String description, Object parameters, Boolean strict) {
+        this.name = name;
+        this.description = description;
+        this.parameters = parameters;
+        this.strict = strict;
+    }
+
+    /**
+     * The name of the function to be called. This must be unique and can only contain a-z, A-Z, 0-9, underscores, and dashes.
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * A brief description of what the function does. Helps the model choose when to call it.
+     */
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * The parameters accepted by the function, defined as an arbitrary JSON schema object.
+     */
+    public Object getParameters() {
+        return parameters;
+    }
+
+    /**
+     * Whether to enforce strict schema adherence for the parameters.
+     */
+    public Boolean getStrict() {
+        return strict;
+    }
+
+}
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTMessageRole.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTMessageRole.java
index 22c2b0889..6fa802004 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTMessageRole.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTMessageRole.java
@@ -23,7 +23,13 @@ public enum GPTMessageRole {
      * The assistant messages help store prior responses. It can also serve as an example of desired behavior.
      */
     @SerializedName("assistant")
-    ASSISTANT("assistant");
+    ASSISTANT("assistant"),
+
+    /**
+     * A result of a tool call the assistant made.
+     */
+    @SerializedName("tool")
+    TOOL("tool");
 
     private final String externalRepresentation;
 
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTTool.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTTool.java
new file mode 100644
index 000000000..c820ab88c
--- /dev/null
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTTool.java
@@ -0,0 +1,56 @@
+package com.composum.ai.backend.base.service.chat;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+/**
+ * An action the AI can perform - likely from the sidebar chat.
+ *
+ * @see "https://platform.openai.com/docs/guides/function-calling"
+ */
+public interface GPTTool {
+
+    /**
+     * The name of the tool - must be exactly the name given in {@link #getToolDeclaration()}.
+     */
+    @Nonnull
+    String getName();
+
+    /**
+     * The description to use for the OpenAI tool call. Will be inserted into the OpenAI tools array. E.g.:
+     * <code><pre>
+     *       {
+     *         "type": "function",
+     *         "function": {
+     *           "name": "get_delivery_date",
+     *           "description": "Get the delivery date for a customer's order. Call this whenever you need to know the delivery date, for example when a customer asks 'Where is my package'",
+     *           "parameters": {
+     *             "type": "object",
+     *             "properties": {
+     *               "order_id": {
+     *                 "type": "string",
+     *                 "description": "The customer's order ID."
+     *               }
+     *             },
+     *             "required": ["order_id"],
+     *             "additionalProperties": false
+     *           }
+     *         },
+     *         "strict": true
+     *       }
+     * </pre></code>
+     *
+     * @see "https://platform.openai.com/docs/api-reference/chat/create"
+     */
+    @Nonnull
+    String getToolDeclaration();
+
+    /**
+     * Executes the tool call and returns the result to present to the AI.
+     *
+     * @param arguments The arguments to the tool call, as JSON that matches the schema given in {@link #getToolDeclaration()}.
+     */
+    @Nonnull
+    public String execute(@Nullable String arguments, @Nullable GPTCompletionCallback.GPTToolExecutionContext context);
+
+}
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTToolCall.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTToolCall.java
new file mode 100644
index 000000000..d31f1989e
--- /dev/null
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/GPTToolCall.java
@@ -0,0 +1,123 @@
+package com.composum.ai.backend.base.service.chat;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import javax.annotation.Nullable;
+
+/**
+ * Represents a tool call generated by the model in a chat completion response.
+ * This can be a function call with specific arguments.
+ */
+public class GPTToolCall {
+
+    private final String id;
+    private final String type;
+    private final GPTFunctionCallDetails function;
+
+    /**
+     * Creates the object
+     *
+     * @param id       The ID of the tool call.
+     * @param type     The type of the tool, currently only "function" is supported.
+     * @param function The function being called by the model, including its name and arguments.
+     */
+    public GPTToolCall(String id, String type, GPTFunctionCallDetails function) {
+        this.id = id;
+        this.type = type;
+        this.function = function;
+    }
+
+    /**
+     * The ID of the tool call.
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * The type of the tool, currently only "function" is supported.
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * The function being called by the model, including its name and arguments.
+     */
+    public GPTFunctionCallDetails getFunction() {
+        return function;
+    }
+
+    /**
+     * String representation for debugging.
+     */
+    @Override
+    public String toString() {
+        return "GPTFunctionCallDetails{" +
+                "id='" + id + '\'' +
+                ", type='" + type + '\'' +
+                ", function=" + function +
+                '}';
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof GPTToolCall)) return false;
+        GPTToolCall that = (GPTToolCall) o;
+        return Objects.equals(getId(), that.getId()) &&
+                Objects.equals(getType(), that.getType()) &&
+                Objects.equals(getFunction(), that.getFunction());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getId(), getType(), getFunction());
+    }
+
+    /**
+     * When streaming, this merges the delta received during the stream.
+     */
+    public GPTToolCall mergeDelta(@Nullable GPTToolCall other) {
+        if (other == null) {
+            return this;
+        }
+        if (id != null && other.id != null && !id.equals(other.id)) {
+            throw new IllegalArgumentException("Bug: trying to merge tool calls with different IDs: " + id + " and " + other.id);
+        }
+        String newId = id == null ? other.id : id;
+        String newType = type == null ? other.type : type;
+        GPTFunctionCallDetails newFunction = function == null ? other.function : function.mergeDelta(other.function);
+        return new GPTToolCall(newId, newType, newFunction);
+    }
+
+    /**
+     * When streaming, this merges the delta received during the stream.
+     */
+    @Nullable
+    public static List<GPTToolCall> mergeDelta(@Nullable List<GPTToolCall> calls1, @Nullable List<GPTToolCall> calls2) {
+        if (calls1 == null || calls1.isEmpty()) {
+            return calls2;
+        }
+        if (calls2 == null || calls2.isEmpty()) {
+            return calls1;
+        }
+        int maxIndex = Math.max(calls1.size(), calls2.size());
+        List<GPTToolCall> calls = new ArrayList<>(maxIndex + 1);
+        for (int i = 0; i < maxIndex; i++) {
+            GPTToolCall call1 = i < calls1.size() ? calls1.get(i) : null;
+            GPTToolCall call2 = i < calls2.size() ? calls2.get(i) : null;
+            if (call2 == null) {
+                calls.add(call1);
+            } else if (call1 == null) {
+                calls.add(call2);
+            } else {
+                calls.add(call1.mergeDelta(call2));
+            }
+        }
+        return calls;
+    }
+
+}
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImpl.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImpl.java
index 3704cb5f3..37e03c805 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImpl.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImpl.java
@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -71,15 +72,22 @@
 import com.composum.ai.backend.base.service.GPTException;
 import com.composum.ai.backend.base.service.chat.GPTChatCompletionService;
 import com.composum.ai.backend.base.service.chat.GPTChatMessage;
+import com.composum.ai.backend.base.service.chat.GPTChatMessagesTemplate;
 import com.composum.ai.backend.base.service.chat.GPTChatRequest;
 import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
 import com.composum.ai.backend.base.service.chat.GPTConfiguration;
 import com.composum.ai.backend.base.service.chat.GPTFinishReason;
+import com.composum.ai.backend.base.service.chat.GPTMessageRole;
+import com.composum.ai.backend.base.service.chat.GPTTool;
+import com.composum.ai.backend.base.service.chat.GPTToolCall;
 import com.composum.ai.backend.base.service.chat.impl.chatmodel.ChatCompletionChoice;
+import com.composum.ai.backend.base.service.chat.impl.chatmodel.ChatCompletionFunctionDetails;
 import com.composum.ai.backend.base.service.chat.impl.chatmodel.ChatCompletionMessage;
 import com.composum.ai.backend.base.service.chat.impl.chatmodel.ChatCompletionMessagePart;
 import com.composum.ai.backend.base.service.chat.impl.chatmodel.ChatCompletionRequest;
 import com.composum.ai.backend.base.service.chat.impl.chatmodel.ChatCompletionResponse;
+import com.composum.ai.backend.base.service.chat.impl.chatmodel.ChatCompletionToolCall;
+import com.composum.ai.backend.base.service.chat.impl.chatmodel.ChatTool;
 import com.composum.ai.backend.base.service.chat.impl.chatmodel.OpenAIEmbeddings;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.gson.Gson;
@@ -424,6 +432,60 @@ public void streamingChatCompletion(@Nonnull GPTChatRequest request, @Nonnull GP
         }
     }
 
+    @Override
+    public void streamingChatCompletionWithToolCalls(@Nonnull GPTChatRequest request, @Nonnull GPTCompletionCallback callback)
+            throws GPTException {
+        if (request.getConfiguration() == null || request.getConfiguration().getTools() == null || request.getConfiguration().getTools().isEmpty()) {
+            streamingChatCompletion(request, callback);
+            return;
+        }
+        GPTCompletionCallback callbackWrapper = new GPTCompletionCallback.GPTCompletionCallbackWrapper(callback) {
+            List<GPTToolCall> collectedToolcalls = null;
+
+            @Override
+            public void toolDelta(List<GPTToolCall> toolCalls) {
+                collectedToolcalls = GPTToolCall.mergeDelta(collectedToolcalls, toolCalls);
+            }
+
+            @Override
+            public void onFinish(GPTFinishReason finishReason) {
+                if (GPTFinishReason.TOOL_CALLS == finishReason) {
+                    LOG.info("Executing tool calls");
+                    LOG.debug("Tool calls: {}", collectedToolcalls);
+                    GPTChatRequest requestWithToolCalls = request.copy();
+                    GPTChatMessage assistantRequestsToolcallsMessage =
+                            new GPTChatMessage(GPTMessageRole.ASSISTANT, null, null, null, collectedToolcalls);
+                    requestWithToolCalls.addMessage(assistantRequestsToolcallsMessage);
+                    for (GPTToolCall toolCall : collectedToolcalls) {
+                        Optional<GPTTool> toolOption = request.getConfiguration().getTools().stream()
+                                .filter(tool -> tool.getName().equals(toolCall.getFunction().getName()))
+                                .findAny();
+                        if (!toolOption.isPresent()) { // should be impossible
+                            LOG.error("Bug: Tool {} not found in configuration", toolCall.getFunction().getName());
+                            GPTException error = new GPTException("Bug: Tool " + toolCall.getFunction().getName() + " not found in configuration");
+                            this.onError(error);
+                            throw error;
+                        }
+                        GPTTool tool = toolOption.get();
+                        String toolresult = tool.execute(toolCall.getFunction().getArguments(), getToolExecutionContext());
+                        if (null == toolresult) {
+                            toolresult = "";
+                        }
+                        LOG.debug("Tool {} with arguments {} returned {}", toolCall.getFunction().getName(),
+                                toolCall.getFunction().getArguments(),
+                                toolresult.substring(0, Math.min(100, toolresult.length())) + "...");
+                        GPTChatMessage toolResponseMessage = new GPTChatMessage(GPTMessageRole.TOOL, toolresult, null, toolCall.getId(), null);
+                        requestWithToolCalls.addMessage(toolResponseMessage);
+                    }
+                    streamingChatCompletionWithToolCalls(requestWithToolCalls, callback);
+                } else {
+                    super.onFinish(finishReason);
+                }
+            }
+        };
+        streamingChatCompletion(request, callbackWrapper);
+    }
+
     /**
      * Handle a single line of the streaming response.
      * <ul>
@@ -435,9 +497,11 @@ public void streamingChatCompletion(@Nonnull GPTChatRequest request, @Nonnull GP
     protected void handleStreamingEvent(GPTCompletionCallback callback, long id, String line) {
         if (line.startsWith("data:")) {
             line = line.substring(MAXTRIES);
+            System.out.println(line);
             try {
                 if (" [DONE]".equals(line)) {
                     LOG.debug("Response {} from GPT received DONE", id);
+                    callback.close();
                     return;
                 }
                 ChatCompletionResponse chunk = gson.fromJson(line, ChatCompletionResponse.class);
@@ -453,6 +517,12 @@ protected void handleStreamingEvent(GPTCompletionCallback callback, long id, Str
                     LOG.trace("Response {} from GPT: {}", id, content);
                     callback.onNext(content);
                 }
+                if (choice.getDelta().getToolCalls() != null) {
+                    callback.toolDelta(ChatCompletionToolCall.toGptToolCallList(choice.getDelta().getToolCalls()));
+                }
+                if (choice.getFinishReason() != null) {
+                    LOG.trace("Response {} from GPT finished with reason {}", id, choice.getFinishReason());
+                }
                 GPTFinishReason finishReason = ChatCompletionResponse.FinishReason.toGPTFinishReason(choice.getFinishReason());
                 if (finishReason != null) {
                     LOG.debug("Response {} from GPT finished with reason {}", id, finishReason);
@@ -618,11 +688,32 @@ protected String createJsonRequest(GPTChatRequest request) throws JsonProcessing
             externalRequest.setMaxTokens(maxTokens);
         }
         externalRequest.setStream(Boolean.TRUE);
+        externalRequest.setTools(convertTools(request.getConfiguration()));
         String jsonRequest = gson.toJson(externalRequest);
         checkTokenCount(jsonRequest);
         return jsonRequest;
     }
 
+    private List<ChatTool> convertTools(GPTConfiguration configuration) {
+        if (configuration == null || configuration.getTools() == null || configuration.getTools().isEmpty()) {
+            return null;
+        }
+        List<ChatTool> result = new ArrayList<>();
+        for (GPTTool tool : configuration.getTools()) {
+            ChatTool toolDescr = new ChatTool();
+            ChatCompletionFunctionDetails details = new ChatCompletionFunctionDetails();
+            details.setName(tool.getName());
+            details.setStrict(true);
+            Map declaration = gson.fromJson(tool.getToolDeclaration(), Map.class);
+            Map function = (Map) declaration.get("function");
+            details.setParameters(function.get("parameters"));
+            details.setDescription((String) function.get("description"));
+            toolDescr.setFunction(details);
+            result.add(toolDescr);
+        }
+        return result;
+    }
+
     protected void checkEnabled() {
         if (!isEnabled()) {
             throw new IllegalStateException("Not enabled or no API key configured for the GPT chat completion service. Please configure the service.");
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTContentCreationServiceImpl.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTContentCreationServiceImpl.java
index 5c2e51aa5..d5775a9ab 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTContentCreationServiceImpl.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTContentCreationServiceImpl.java
@@ -18,6 +18,7 @@
 import com.composum.ai.backend.base.service.GPTException;
 import com.composum.ai.backend.base.service.chat.GPTChatCompletionService;
 import com.composum.ai.backend.base.service.chat.GPTChatMessage;
+import com.composum.ai.backend.base.service.chat.GPTChatMessagesTemplate;
 import com.composum.ai.backend.base.service.chat.GPTChatRequest;
 import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
 import com.composum.ai.backend.base.service.chat.GPTConfiguration;
@@ -125,7 +126,7 @@ protected GPTChatRequest makeExecutePromptRequest(String prompt, @Nullable GPTCh
     @Override
     public void executePromptStreaming(@Nonnull String prompt, @Nullable GPTChatRequest additionalParameters, @Nonnull GPTCompletionCallback callback) throws GPTException {
         GPTChatRequest request = makeExecutePromptRequest(prompt, additionalParameters);
-        chatCompletionService.streamingChatCompletion(request, callback);
+        chatCompletionService.streamingChatCompletionWithToolCalls(request, callback);
     }
 
     @Nonnull
@@ -164,7 +165,7 @@ protected GPTChatRequest makeExecuteOnTextRequest(String prompt, String text, @N
     @Override
     public void executePromptOnTextStreaming(@Nonnull String prompt, @Nonnull String text, @Nullable GPTChatRequest additionalParameters, @Nonnull GPTCompletionCallback callback) throws GPTException {
         GPTChatRequest request = makeExecuteOnTextRequest(prompt, text, additionalParameters);
-        chatCompletionService.streamingChatCompletion(request, callback);
+        chatCompletionService.streamingChatCompletionWithToolCalls(request, callback);
     }
 
 }
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTTranslationServiceImpl.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTTranslationServiceImpl.java
index 5370fc6c2..c11c99f6b 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTTranslationServiceImpl.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/GPTTranslationServiceImpl.java
@@ -34,6 +34,7 @@
 import com.composum.ai.backend.base.service.GPTException;
 import com.composum.ai.backend.base.service.chat.GPTChatCompletionService;
 import com.composum.ai.backend.base.service.chat.GPTChatMessage;
+import com.composum.ai.backend.base.service.chat.GPTChatMessagesTemplate;
 import com.composum.ai.backend.base.service.chat.GPTChatRequest;
 import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
 import com.composum.ai.backend.base.service.chat.GPTConfiguration;
@@ -82,27 +83,30 @@ public String singleTranslation(@Nullable String rawText, @Nullable String sourc
             String text = m.group(2);
             String after = m.group(3);
             String response;
+
+            if (text == null || text.trim().isEmpty() || targetLanguage == null || targetLanguage.trim().isEmpty()) {
+                return "";
+            }
+
+            GPTChatRequest request = makeRequest(text, sourceLanguage, targetLanguage, configuration);
+            String cacheKey = cacheKey(request);
+            String cachedResponse = getCachedResponse(cacheKey);
+            if (cachedResponse != null) {
+                LOG.debug("Returning cached result: {} -> {} - {} -> {}", sourceLanguage, targetLanguage, text, cachedResponse);
+                return cachedResponse;
+            }
+
             if (config.fakeTranslation()) {
+                LOG.debug("Faking response to request {}", request);
                 response = fakeTranslation(text);
             } else {
-
-                if (text == null || text.trim().isEmpty() || targetLanguage == null || targetLanguage.trim().isEmpty()) {
-                    return "";
-                }
-
-                GPTChatRequest request = makeRequest(text, sourceLanguage, targetLanguage, configuration);
-                String cacheKey = cacheKey(request);
-                String cachedResponse = getCachedResponse(cacheKey);
-                if (cachedResponse != null) {
-                    LOG.debug("Returning cached result: {} -> {} - {} -> {}", sourceLanguage, targetLanguage, text, cachedResponse);
-                    return cachedResponse;
-                }
                 response = chatCompletionService.getSingleChatCompletion(request);
-                response = response != null ? response.trim() : "";
-                LOG.trace("Returning result: {} -> {} - {} -> {}", sourceLanguage, targetLanguage, text, response);
-                cacheResponse(cacheKey, request, response);
             }
 
+            response = response != null ? response.trim() : "";
+            LOG.trace("Returning result: {} -> {} - {} -> {}", sourceLanguage, targetLanguage, text, response);
+            cacheResponse(cacheKey, request, response);
+
             return before + response + after;
         } else {
             throw new IllegalStateException("Bug - that shouldn't happen. Text: '" + rawText + "'");
@@ -118,13 +122,16 @@ public void streamingSingleTranslation(@Nonnull String text, @Nonnull String sou
                 targetLanguage == null || targetLanguage.trim().isEmpty()) {
             throw new IllegalArgumentException("Empty text or languages");
         }
+
+        GPTChatRequest request = makeRequest(text, sourceLanguage, targetLanguage, configuration);
+
         if (config.fakeTranslation()) {
+            LOG.debug("Faking response to request {}", request);
             callback.onNext(fakeTranslation(text));
             callback.onFinish(GPTFinishReason.STOP);
             return;
         }
 
-        GPTChatRequest request = makeRequest(text, sourceLanguage, targetLanguage, configuration);
         // we don't do caching here since that'd be complicated and this is only for interactive use, not bulk use, anyway.
         chatCompletionService.streamingChatCompletion(request, callback);
     }
@@ -175,12 +182,7 @@ public List<String> fragmentedTranslation(@Nonnull List<String> texts, @Nonnull
                 .distinct()
                 .collect(Collectors.toList());
 
-        List<String> translatedRealTexts;
-        if (config.fakeTranslation()) {
-            translatedRealTexts = realTexts.stream().map(GPTTranslationServiceImpl::fakeTranslation).collect(Collectors.toList());
-        } else {
-            translatedRealTexts = fragmentedTranslationDivideAndConquer(realTexts, targetLanguage, configuration, new AtomicInteger(10), translationChecks);
-        }
+        List<String> translatedRealTexts = fragmentedTranslationDivideAndConquer(realTexts, targetLanguage, configuration, new AtomicInteger(10), translationChecks);
 
         Map<String, String> translatedRealTextsMap = new LinkedHashMap<>();
         for (int i = 0; i < realTexts.size(); i++) {
@@ -239,7 +241,7 @@ protected List<String> fragmentedTranslationDivideAndConquer(@Nonnull List<Strin
         }
 
         // The loss of context is a problem, but we go for graceful degradation here.
-        GPTConfiguration cleanedConfiguration = configuration.replaceContexts(null);
+        GPTConfiguration cleanedConfiguration = configuration != null ? configuration.replaceContexts(null) : configuration;
 
         int half = texts.size() / 2;
         List<String> firstHalf = texts.subList(0, half);
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionChoice.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionChoice.java
index 051ab479b..18b172d72 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionChoice.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionChoice.java
@@ -2,17 +2,33 @@
 
 import com.google.gson.annotations.SerializedName;
 
+/**
+ * Represents a choice in the chat completion response. Each choice may include a message,
+ * a delta (for streaming responses), and a finish reason indicating why the completion stopped.
+ */
 public class ChatCompletionChoice {
 
+    /**
+     * The position of this choice in the list of choices returned by the API.
+     */
     @SerializedName("index")
     private int index;
 
+    /**
+     * The message content associated with this choice.
+     */
     @SerializedName("message")
     private ChatCompletionChoiceMessage message;
 
+    /**
+     * Used for incremental updates (streaming responses), represents partial message content.
+     */
     @SerializedName("delta")
     private ChatCompletionChoiceMessage delta;
 
+    /**
+     * The reason why the completion stopped (e.g., length, stop signal).
+     */
     @SerializedName("finish_reason")
     private ChatCompletionResponse.FinishReason finishReason;
 
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionChoiceMessage.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionChoiceMessage.java
index 4913a8968..a7d2e6ccd 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionChoiceMessage.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionChoiceMessage.java
@@ -1,15 +1,33 @@
 package com.composum.ai.backend.base.service.chat.impl.chatmodel;
 
+import java.util.List;
+
 import com.google.gson.annotations.SerializedName;
 
+/**
+ * Represents the message content in a chat completion choice, including the role (e.g., user, assistant)
+ * and the actual text content of the message.
+ */
 public class ChatCompletionChoiceMessage {
 
+    /**
+     * The role of the message (e.g., user, assistant, or system).
+     */
     @SerializedName("role")
     private ChatCompletionRequest.Role role;
 
+    /**
+     * The text content of the message.
+     */
     @SerializedName("content")
     private String content;
 
+    /**
+     * The tool calls generated by the model, such as function calls.
+     */
+    @SerializedName("tool_calls")
+    private List<ChatCompletionToolCall> toolCalls;
+
     // Getters and setters
     public ChatCompletionRequest.Role getRole() {
         return role;
@@ -19,6 +37,14 @@ public void setRole(ChatCompletionRequest.Role role) {
         this.role = role;
     }
 
+    public List<ChatCompletionToolCall> getToolCalls() {
+        return toolCalls;
+    }
+
+    public void setToolCalls(List<ChatCompletionToolCall> toolCalls) {
+        this.toolCalls = toolCalls;
+    }
+
     public String getContent() {
         return content;
     }
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionFunctionCallDetails.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionFunctionCallDetails.java
new file mode 100644
index 000000000..568d96eb8
--- /dev/null
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionFunctionCallDetails.java
@@ -0,0 +1,71 @@
+package com.composum.ai.backend.base.service.chat.impl.chatmodel;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.composum.ai.backend.base.service.chat.GPTFunctionCallDetails;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Represents the a call of a function used as a tool in the chat completion request.
+ */
+public class ChatCompletionFunctionCallDetails {
+
+    /**
+     * The name of the function to be called. This must be unique and can only contain a-z, A-Z, 0-9, underscores, and dashes.
+     */
+    @SerializedName("name")
+    private String name;
+
+    /**
+     * A JSON for the arguments the function is called with.
+     */
+    @SerializedName("arguments")
+    private String arguments;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getArguments() {
+        return arguments;
+    }
+
+    public void setArguments(String arguments) {
+        this.arguments = arguments;
+    }
+
+    public void mergeDelta(@Nullable ChatCompletionFunctionCallDetails function) {
+        if (function == null) {
+            return;
+        }
+        if (name == null) {
+            name = function.name;
+        }
+        if (arguments == null) {
+            arguments = function.arguments;
+        } else if (function.arguments != null) {
+            arguments = arguments + function.arguments;
+        }
+    }
+
+    @Nonnull
+    public GPTFunctionCallDetails toGptFuctionCallDetails() {
+        return new GPTFunctionCallDetails(name, arguments);
+    }
+
+    public static ChatCompletionFunctionCallDetails make(GPTFunctionCallDetails function) {
+        if (function == null) {
+            return null;
+        }
+        ChatCompletionFunctionCallDetails result = new ChatCompletionFunctionCallDetails();
+        result.setName(function.getName());
+        result.setArguments(function.getArguments());
+        return result;
+    }
+
+}
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionFunctionDetails.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionFunctionDetails.java
new file mode 100644
index 000000000..37452299e
--- /dev/null
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionFunctionDetails.java
@@ -0,0 +1,68 @@
+package com.composum.ai.backend.base.service.chat.impl.chatmodel;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Represents the details of a function used as a tool in the chat completion request.
+ * Includes the function's name, description, parameters, and an optional strict flag.
+ */
+public class ChatCompletionFunctionDetails {
+
+    /**
+     * The name of the function to be called. This must be unique and can only contain a-z, A-Z, 0-9, underscores, and dashes.
+     */
+    @SerializedName("name")
+    private String name;
+
+    /**
+     * A brief description of what the function does. Helps the model choose when to call it.
+     */
+    @SerializedName("description")
+    private String description;
+
+    /**
+     * The parameters accepted by the function, defined as an arbitrary JSON schema object.
+     */
+    @SerializedName("parameters")
+    private Object parameters;  // Arbitrary JSON schema
+
+    /**
+     * Whether to enforce strict schema adherence for the parameters.
+     */
+    @SerializedName("strict")
+    private Boolean strict;
+
+    // Getters and setters
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Object getParameters() {
+        return parameters;
+    }
+
+    public void setParameters(Object parameters) {
+        this.parameters = parameters;
+    }
+
+    public Boolean getStrict() {
+        return strict;
+    }
+
+    public void setStrict(Boolean strict) {
+        this.strict = strict;
+    }
+}
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionMessage.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionMessage.java
index 720c8328d..c51032f2a 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionMessage.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionMessage.java
@@ -4,19 +4,55 @@
 import java.util.List;
 
 import com.composum.ai.backend.base.service.chat.GPTChatMessage;
-import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.JsonAdapter;
 import com.google.gson.annotations.SerializedName;
 
+/**
+ * Represents a message in a chat completion request, containing the role of the speaker
+ * (user, assistant, or system) and the message content, which may include text or other parts.
+ */
 public class ChatCompletionMessage {
 
+    /**
+     * The role of the speaker for this message, such as 'user', 'assistant', 'system', or 'tool'.
+     */
     @SerializedName("role")
     private ChatCompletionRequest.Role role;
 
+    /**
+     * The content of the message, which may include text or other parts (like images).
+     */
     @SerializedName("content")
     @JsonAdapter(ChatCompletionMessagePart.ChatCompletionMessagePartListDeSerializer.class)
     private List<ChatCompletionMessagePart> content;
 
+    /**
+     * The ID of the tool call that this message is responding to.
+     * Only applicable when the role is 'tool'.
+     */
+    @SerializedName("tool_call_id")
+    private String toolCallId;
+
+    /** List of tool calls that should be executed. */
+    @SerializedName("tool_calls")
+    private List<ChatCompletionToolCall> toolCalls;
+
+    public static ChatCompletionMessage make(GPTChatMessage message) {
+        ChatCompletionMessagePart part;
+        if (message.getImageUrl() != null && !message.getImageUrl().isEmpty()) {
+            part = ChatCompletionMessagePart.imageUrl(message.getImageUrl());
+        } else {
+            part = ChatCompletionMessagePart.text(message.getContent());
+        }
+        ChatCompletionRequest.Role role = ChatCompletionRequest.Role.make(message.getRole());
+        ChatCompletionMessage result = new ChatCompletionMessage();
+        result.setRole(role);
+        result.setContent(Collections.singletonList(part));
+        result.setToolCallId(message.getToolCallId());
+        result.setToolCalls(ChatCompletionToolCall.make(message.getToolCalls()));
+        return result;
+    }
+
     // Getters and setters
     public ChatCompletionRequest.Role getRole() {
         return role;
@@ -26,6 +62,14 @@ public void setRole(ChatCompletionRequest.Role role) {
         this.role = role;
     }
 
+    public String getToolCallId() {
+        return toolCallId;
+    }
+
+    public void setToolCallId(String toolCallId) {
+        this.toolCallId = toolCallId;
+    }
+
     public List<ChatCompletionMessagePart> getContent() {
         return content;
     }
@@ -34,22 +78,18 @@ public void setContent(List<ChatCompletionMessagePart> content) {
         this.content = content;
     }
 
-    public boolean isEmpty(Void ignoreJustPreventSerialization) {
-        return content == null || content.isEmpty() ||
-                !content.stream().anyMatch(m -> !m.isEmpty(null));
+    public List<ChatCompletionToolCall> getToolCalls() {
+        return toolCalls;
     }
 
-    public static ChatCompletionMessage make(GPTChatMessage message) {
-        ChatCompletionMessagePart part;
-        if (message.getImageUrl() != null && !message.getImageUrl().isEmpty()) {
-            part = ChatCompletionMessagePart.imageUrl(message.getImageUrl());
-        } else {
-            part = ChatCompletionMessagePart.text(message.getContent());
-        }
-        ChatCompletionRequest.Role role = ChatCompletionRequest.Role.make(message.getRole());
-        ChatCompletionMessage result = new ChatCompletionMessage();
-        result.setRole(role);
-        result.setContent(Collections.singletonList(part));
-        return result;
+    public void setToolCalls(List<ChatCompletionToolCall> toolCalls) {
+        this.toolCalls = toolCalls;
+    }
+
+    public boolean isEmpty(Void ignoreJustPreventSerialization) {
+        boolean contentIsEmpty = content == null || content.isEmpty() ||
+                !content.stream().anyMatch(m -> !m.isEmpty(null));
+        return contentIsEmpty && (toolCallId == null || toolCallId.isEmpty()) &&
+                (toolCalls == null || toolCalls.isEmpty());
     }
 }
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionMessagePart.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionMessagePart.java
index b6ec5630b..b9bab079d 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionMessagePart.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionMessagePart.java
@@ -12,7 +12,8 @@
 import com.google.gson.annotations.SerializedName;
 
 /**
- * A text part or image part of a chat completion message.
+ * Represents a part of a chat completion message, which may be a text or an image URL.
+ * This allows messages to include multiple types of content.
  * <pre><code>
  *          {
  *           "type": "text",
@@ -29,24 +30,40 @@
  */
 public class ChatCompletionMessagePart {
 
-    public enum Type {
-        @SerializedName("text")
-        TEXT,
-        @SerializedName("image_url")
-        IMAGE_URL
-    }
-
+    /**
+     * The type of this message part, either 'text' or 'image_url'.
+     */
     @SerializedName("type")
     private Type type;
-
+    /**
+     * The text content of this message part, used when the type is 'text'.
+     */
     @SerializedName("text")
     private String text;
-
+    /**
+     * The image URL content of this message part, used when the type is 'image_url'.
+     */
     @SerializedName("image_url")
     private ChatCompletionMessageUrlPart imageUrl;
 
+    public static ChatCompletionMessagePart text(String text) {
+        ChatCompletionMessagePart part = new ChatCompletionMessagePart();
+        part.setType(Type.TEXT);
+        part.setText(text);
+        return part;
+    }
+
     // Getters and setters
 
+    public static ChatCompletionMessagePart imageUrl(String imageUrl) {
+        ChatCompletionMessagePart part = new ChatCompletionMessagePart();
+        part.setType(Type.IMAGE_URL);
+        ChatCompletionMessageUrlPart urlpart = new ChatCompletionMessageUrlPart();
+        urlpart.setUrl(imageUrl);
+        part.setImageUrl(urlpart);
+        return part;
+    }
+
     public Type getType() {
         return type;
     }
@@ -76,20 +93,18 @@ public boolean isEmpty(Void ignoreJustPreventSerialization) {
                 (imageUrl == null || imageUrl.getUrl() == null || imageUrl.getUrl().isEmpty());
     }
 
-    public static ChatCompletionMessagePart text(String text) {
-        ChatCompletionMessagePart part = new ChatCompletionMessagePart();
-        part.setType(Type.TEXT);
-        part.setText(text);
-        return part;
+    public enum Type {
+        @SerializedName("text")
+        TEXT,
+        @SerializedName("image_url")
+        IMAGE_URL
     }
 
-    public static ChatCompletionMessagePart imageUrl(String imageUrl) {
-        ChatCompletionMessagePart part = new ChatCompletionMessagePart();
-        part.setType(Type.IMAGE_URL);
-        ChatCompletionMessageUrlPart urlpart = new ChatCompletionMessageUrlPart();
-        urlpart.setUrl(imageUrl);
-        part.setImageUrl(urlpart);
-        return part;
+    public enum ImageDetail {
+        @SerializedName("low")
+        LOW,
+        @SerializedName("high")
+        HIGH
     }
 
     /**
@@ -123,14 +138,6 @@ public void setDetail(ImageDetail detail) {
 
     }
 
-    public enum ImageDetail {
-        @SerializedName("low")
-        LOW,
-        @SerializedName("high")
-        HIGH
-    }
-
-
     public static class ChatCompletionMessagePartListDeSerializer implements JsonDeserializer<List<ChatCompletionMessagePart>>,
             JsonSerializer<List<ChatCompletionMessagePart>> {
 
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionRequest.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionRequest.java
index a808f93e6..569a6e4c4 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionRequest.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionRequest.java
@@ -5,28 +5,59 @@
 import com.composum.ai.backend.base.service.chat.GPTMessageRole;
 import com.google.gson.annotations.SerializedName;
 
+/**
+ * Represents a request to the OpenAI chat completion API, including model, messages,
+ * and optional parameters like max tokens, temperature, and response format.
+ */
 public class ChatCompletionRequest {
 
+    public static final ResponseFormat JSON = new ResponseFormat();
+    /**
+     * The AI model to use for the chat completion request, e.g., "gpt-4".
+     */
     @SerializedName("model")
     private String model;
-
+    /**
+     * The list of messages in the conversation, each with a role (user, assistant, system) and content.
+     */
     @SerializedName("messages")
     private List<ChatCompletionMessage> messages;
-
+    /**
+     * The maximum number of tokens to generate in the completion.
+     */
     @SerializedName("max_tokens")
     private Integer maxTokens;
-
+    /**
+     * Whether to stream the response incrementally.
+     */
     @SerializedName("stream")
     private Boolean stream;
-
+    /**
+     * The sampling temperature, used to control randomness. Values closer to 0 make the output more deterministic.
+     */
     @SerializedName("temperature")
     private Double temperature;
-
+    /**
+     * The format of the response. Possible values are "text" or "json_object".
+     */
     @SerializedName("response_format")
     private ResponseFormat responseFormat;
-
+    /**
+     * A seed for deterministic generation, useful for testing or reproducible results.
+     */
     @SerializedName("seed")
     private Integer seed;
+    /**
+     * A list of tools (functions) the model can call during the chat. Each tool contains a type and function details.
+     */
+    @SerializedName("tools")
+    private List<ChatTool> tools;
+
+    {
+        {
+            JSON.setType(ResponseFormatType.JSON_OBJECT);
+        }
+    }
 
     // Getters and setters
     public String getModel() {
@@ -77,6 +108,14 @@ public void setResponseFormat(ResponseFormat responseFormat) {
         this.responseFormat = responseFormat;
     }
 
+    public List<ChatTool> getTools() {
+        return tools;
+    }
+
+    public void setTools(List<ChatTool> tools) {
+        this.tools = tools;
+    }
+
     public Integer getSeed() {
         return seed;
     }
@@ -91,7 +130,9 @@ public enum Role {
         @SerializedName("assistant")
         ASSISTANT,
         @SerializedName("system")
-        SYSTEM;
+        SYSTEM,
+        @SerializedName("tool")
+        TOOL;
 
         public static Role make(GPTMessageRole role) {
             switch (role) {
@@ -101,6 +142,8 @@ public static Role make(GPTMessageRole role) {
                     return SYSTEM;
                 case ASSISTANT:
                     return ASSISTANT;
+                case TOOL:
+                    return TOOL;
                 default:
                     throw new IllegalArgumentException("Unknown role " + role);
             }
@@ -138,9 +181,4 @@ public void setType(ResponseFormatType type) {
         }
     }
 
-    public static final ResponseFormat JSON = new ResponseFormat();
-    {{
-        JSON.setType(ResponseFormatType.JSON_OBJECT);
-    }};
-
 }
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionResponse.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionResponse.java
index ce9eb147d..ba7027afb 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionResponse.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionResponse.java
@@ -5,26 +5,51 @@
 import com.composum.ai.backend.base.service.chat.GPTFinishReason;
 import com.google.gson.annotations.SerializedName;
 
+/**
+ * Represents the response from the OpenAI chat completion API, containing details
+ * about the generated choices, token usage, and metadata like the model used and creation time.
+ */
 public class ChatCompletionResponse {
 
+    /**
+     * The unique identifier for this chat completion response.
+     */
     @SerializedName("id")
     private String id;
 
+    /**
+     * The type of object returned, typically 'chat.completion'.
+     */
     @SerializedName("object")
     private String object;
 
+    /**
+     * The timestamp (in epoch seconds) when this response was created.
+     */
     @SerializedName("created")
     private long created;
 
+    /**
+     * The model used for this chat completion, e.g., 'gpt-4'.
+     */
     @SerializedName("model")
     private String model;
 
+    /**
+     * An optional fingerprint of the system that generated this response.
+     */
     @SerializedName("system_fingerprint")
     private String systemFingerprint;
 
+    /**
+     * The list of choices the model generated, each with a message and finish reason.
+     */
     @SerializedName("choices")
     private List<ChatCompletionChoice> choices;
 
+    /**
+     * Token usage information for this completion, including total, prompt, and completion tokens.
+     */
     @SerializedName("usage")
     private ChatCompletionUsage usage;
 
@@ -91,7 +116,13 @@ public enum FinishReason {
         @SerializedName("length")
         LENGTH,
         @SerializedName("content_filter")
-        CONTENT_FILTER;
+        CONTENT_FILTER,
+        @SerializedName("tool_calls")
+        TOOL_CALLS,
+        @Deprecated
+        @SerializedName("function_call")
+        FUNCTION_CALL,
+        ;
 
         public static GPTFinishReason toGPTFinishReason(FinishReason finishReason) {
             if (finishReason == null) {
@@ -104,6 +135,10 @@ public static GPTFinishReason toGPTFinishReason(FinishReason finishReason) {
                     return GPTFinishReason.LENGTH;
                 case CONTENT_FILTER:
                     return GPTFinishReason.CONTENT_FILTER;
+                case TOOL_CALLS:
+                    return GPTFinishReason.TOOL_CALLS;
+                case FUNCTION_CALL:
+                    return GPTFinishReason.FUNCTION_CALL;
                 default:
                     throw new IllegalArgumentException("Unknown finish reason: " + finishReason);
             }
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionToolCall.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionToolCall.java
new file mode 100644
index 000000000..5eb709379
--- /dev/null
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionToolCall.java
@@ -0,0 +1,173 @@
+package com.composum.ai.backend.base.service.chat.impl.chatmodel;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.composum.ai.backend.base.service.chat.GPTToolCall;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Represents a tool call generated by the model in a chat completion response.
+ * This can be a function call with specific arguments.
+ */
+public class ChatCompletionToolCall {
+
+    /**
+     * The ID of the tool call.
+     */
+    @SerializedName("id")
+    private String id;
+
+    /**
+     * The index of the tool call in the list of tool calls.
+     */
+    @SerializedName("index")
+    private int index;
+
+    /**
+     * The type of the tool, currently only "function" is supported.
+     */
+    @SerializedName("type")
+    private String type;
+
+    /**
+     * The function being called by the model, including its name and arguments.
+     */
+    @SerializedName("function")
+    private ChatCompletionFunctionCallDetails function;
+
+    // Getters and setters
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public int getIndex() {
+        return index;
+    }
+
+    public void setIndex(int index) {
+        this.index = index;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public ChatCompletionFunctionCallDetails getFunction() {
+        return function;
+    }
+
+    public void setFunction(ChatCompletionFunctionCallDetails function) {
+        this.function = function;
+    }
+
+    @Nullable
+    public static List<ChatCompletionToolCall> mergeDelta(@Nullable List<ChatCompletionToolCall> calls1,
+                                                          @Nullable List<ChatCompletionToolCall> calls2) {
+        if (calls1 == null || calls1.isEmpty()) {
+            return calls2;
+        }
+        if (calls2 == null || calls2.isEmpty()) {
+            return calls1;
+        }
+        int maxIndex = Math.max(
+                calls1.stream().mapToInt(ChatCompletionToolCall::getIndex).max().orElse(0),
+                calls2.stream().mapToInt(ChatCompletionToolCall::getIndex).max().orElse(0)
+        );
+        List<ChatCompletionToolCall> calls = new ArrayList<>(maxIndex + 1);
+        for (int i = 0; i <= maxIndex; i++) {
+            calls.add(null);
+        }
+        for (ChatCompletionToolCall call : calls1) {
+            if (call != null) {
+                calls.set(call.getIndex(), call);
+            }
+        }
+        for (ChatCompletionToolCall call : calls2) {
+            if (call != null) {
+                if (calls.get(call.getIndex()) != null) {
+                    calls.get(call.getIndex()).mergeDelta(call);
+                } else {
+                    calls.set(call.getIndex(), call);
+                }
+            }
+        }
+        return calls;
+    }
+
+    public void mergeDelta(@Nullable ChatCompletionToolCall other) {
+        if (other == null) {
+            return;
+        }
+        if (index != other.index) {
+            throw new IllegalArgumentException("Cannot merge tool calls with different indices");
+        }
+        if (id == null) {
+            id = other.id;
+        }
+        if (type == null) {
+            type = other.type;
+        }
+        if (function == null) {
+            function = other.function;
+        } else {
+            function.mergeDelta(other.function);
+        }
+    }
+
+    @Nonnull
+    public GPTToolCall toGptToolCall() {
+        return new GPTToolCall(id, type, function != null ? function.toGptFuctionCallDetails() : null);
+    }
+
+    /**
+     * Turns the list into a {@link GPTToolCall} list observing the {@link #getIndex()}.
+     */
+    @Nullable
+    public static List<GPTToolCall> toGptToolCallList(List<ChatCompletionToolCall> list) {
+        if (list == null) {
+            return null;
+        }
+        List<GPTToolCall> res = new ArrayList<>();
+        int maxIndex = list.stream().mapToInt(ChatCompletionToolCall::getIndex).max().orElse(0);
+        for (int i = 0; i <= maxIndex; ++i) {
+            res.add(null);
+        }
+        for (ChatCompletionToolCall chatCompletionToolCall : list) {
+            if (chatCompletionToolCall != null) {
+                res.set(chatCompletionToolCall.index, chatCompletionToolCall.toGptToolCall());
+            }
+        }
+        return res;
+    }
+
+    public static List<ChatCompletionToolCall> make(List<GPTToolCall> toolCalls) {
+        if (toolCalls == null) {
+            return null;
+        }
+        List<ChatCompletionToolCall> res = new ArrayList<>(toolCalls.size());
+        for (int i = 0; i < toolCalls.size(); i++) {
+            GPTToolCall toolCall = toolCalls.get(i);
+            ChatCompletionToolCall call = new ChatCompletionToolCall();
+            call.setId(toolCall.getId());
+            call.setIndex(i);
+            call.setType(toolCall.getType());
+            call.setFunction(ChatCompletionFunctionCallDetails.make(toolCall.getFunction()));
+            res.add(call);
+        }
+        return res;
+    }
+
+}
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionUsage.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionUsage.java
index 00abed741..62ad1d7db 100644
--- a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionUsage.java
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatCompletionUsage.java
@@ -2,14 +2,27 @@
 
 import com.google.gson.annotations.SerializedName;
 
+/**
+ * Represents the token usage details in a chat completion response, including
+ * the number of tokens used for the prompt, the completion, and the total.
+ */
 public class ChatCompletionUsage {
 
+    /**
+     * The number of tokens used for the prompt (input) in this completion.
+     */
     @SerializedName("prompt_tokens")
     private int promptTokens;
 
+    /**
+     * The number of tokens generated in the completion (output).
+     */
     @SerializedName("completion_tokens")
     private int completionTokens;
 
+    /**
+     * The total number of tokens used (prompt + completion).
+     */
     @SerializedName("total_tokens")
     private int totalTokens;
 
diff --git a/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatTool.java b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatTool.java
new file mode 100644
index 000000000..b2713f7e1
--- /dev/null
+++ b/backend/base/src/main/java/com/composum/ai/backend/base/service/chat/impl/chatmodel/ChatTool.java
@@ -0,0 +1,40 @@
+package com.composum.ai.backend.base.service.chat.impl.chatmodel;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Represents a tool in the OpenAI chat completion request, currently limited to functions.
+ * Each tool contains details about the function including name, description, and parameters.
+ */
+public class ChatTool {
+
+    /**
+     * The type of the tool, currently fixed as "function".
+     */
+    @SerializedName("type")
+    private String type = "function";  // currently Always "function"
+
+    /**
+     * The details of the function, such as its name, description, and parameters.
+     */
+    @SerializedName("function")
+    private ChatCompletionFunctionDetails function;  // Function details object
+
+    // Getters and setters
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public ChatCompletionFunctionDetails getFunction() {
+        return function;
+    }
+
+    public void setFunction(ChatCompletionFunctionDetails function) {
+        this.function = function;
+    }
+}
diff --git a/backend/base/src/test/java/com/composum/ai/backend/base/BaseArchUnitTest.java b/backend/base/src/test/java/com/composum/ai/backend/base/BaseArchUnitTest.java
new file mode 100644
index 000000000..066eeffff
--- /dev/null
+++ b/backend/base/src/test/java/com/composum/ai/backend/base/BaseArchUnitTest.java
@@ -0,0 +1,30 @@
+package com.composum.ai.backend.base;
+
+import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.classes;
+
+import org.junit.runner.RunWith;
+
+import com.tngtech.archunit.junit.AnalyzeClasses;
+import com.tngtech.archunit.junit.ArchTest;
+import com.tngtech.archunit.junit.ArchUnitRunner;
+import com.tngtech.archunit.lang.ArchRule;
+
+
+/**
+ * We try to cover some architecture failures that were there - package dependendies that should not be there.
+ *
+ * @see "https://www.archunit.org/userguide/html/000_Index.html"
+ */
+@RunWith(ArchUnitRunner.class)
+@AnalyzeClasses(packages = "com.composum.ai.backend.base")
+public class BaseArchUnitTest {
+
+    /**
+     * Classes from API packages should not import anything from the ..impl.. packages.
+     */
+    @ArchTest
+    public static final ArchRule noimportImpl = classes()
+            .that().resideInAPackage("com.composum.ai.backend.base.service.chat")
+            .should().onlyDependOnClassesThat().resideOutsideOfPackages("com.composum.ai..impl..");
+
+}
diff --git a/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTChatMessagesTemplateTest.java b/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/GPTChatMessagesTemplateTest.java
similarity index 95%
rename from backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTChatMessagesTemplateTest.java
rename to backend/base/src/test/java/com/composum/ai/backend/base/service/chat/GPTChatMessagesTemplateTest.java
index 06ac64015..18ecd5ae6 100644
--- a/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTChatMessagesTemplateTest.java
+++ b/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/GPTChatMessagesTemplateTest.java
@@ -1,4 +1,4 @@
-package com.composum.ai.backend.base.service.chat.impl;
+package com.composum.ai.backend.base.service.chat;
 
 import static org.junit.Assert.assertEquals;
 
@@ -12,8 +12,6 @@
 import org.slf4j.impl.SimpleLogger;
 
 import com.composum.ai.backend.base.service.GPTException;
-import com.composum.ai.backend.base.service.chat.GPTChatMessage;
-import com.composum.ai.backend.base.service.chat.GPTMessageRole;
 
 public class GPTChatMessagesTemplateTest {
 
diff --git a/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImplTest.java b/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImplTest.java
index d2f2c2bb5..10c4fd496 100644
--- a/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImplTest.java
+++ b/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImplTest.java
@@ -1,18 +1,20 @@
 package com.composum.ai.backend.base.service.chat.impl;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
-import org.apache.sling.commons.threads.ThreadPoolManager;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.osgi.framework.BundleContext;
 
 import com.composum.ai.backend.base.service.chat.GPTChatCompletionService;
 import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
+import com.composum.ai.backend.base.service.chat.GPTFinishReason;
 import com.fasterxml.jackson.core.JsonProcessingException;
 
 /**
@@ -143,7 +145,7 @@ public void testHandleStreamingEventOK() throws JsonProcessingException {
                 "\"model\":\"gpt-3.5-turbo-0613\"," +
                 "\"choices\":[{\"index\":0,\"delta\":{\"content\":\"Hi\"},\"finish_reason\":null}]}";
         service.handleStreamingEvent(callback, 123, dataline);
-        Mockito.verify(callback).onNext("Hi");
+        verify(callback).onNext("Hi");
     }
 
     @Test
@@ -155,7 +157,35 @@ public void testHandleStreamingEventAdditionalFields() throws JsonProcessingExce
                 "\"somethingunknown\":28," +
                 "\"choices\":[{\"index\":0,\"delta\":{\"content\":\"Hi\"},\"finish_reason\":null}]}";
         service.handleStreamingEvent(callback, 123, dataline);
-        Mockito.verify(callback).onNext("Hi");
+        verify(callback).onNext("Hi");
+    }
+
+
+    /**
+     * Streaming test from real example.
+     */
+    @Test
+    public void testWholeStream() {
+        String[] lines = ("" +
+                "{\"id\":\"chatcmpl-ANLyWhiTkkyRHtRTJcwxGzUTNxiG6\",\"object\":\"chat.completion.chunk\",\"created\":1730129380,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_f59a81427f\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":\"\",\"refusal\":null},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANLyWhiTkkyRHtRTJcwxGzUTNxiG6\",\"object\":\"chat.completion.chunk\",\"created\":1730129380,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_f59a81427f\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"Hello\"},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANLyWhiTkkyRHtRTJcwxGzUTNxiG6\",\"object\":\"chat.completion.chunk\",\"created\":1730129380,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_f59a81427f\",\"choices\":[{\"index\":0,\"delta\":{\"content\":\"!\"},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANLyWhiTkkyRHtRTJcwxGzUTNxiG6\",\"object\":\"chat.completion.chunk\",\"created\":1730129380,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_f59a81427f\",\"choices\":[{\"index\":0,\"delta\":{},\"logprobs\":null,\"finish_reason\":\"stop\"}]}\n" +
+                "[DONE]"
+        ).split("\n");
+        GPTCompletionCallback callback = mock(GPTCompletionCallback.class);
+        StringBuffer result = new StringBuffer();
+        doAnswer(invocation -> {
+            String arg = invocation.getArgument(0);
+            result.append(arg);
+            return null;
+        }).when(callback).onNext(anyString());
+        for (String line : lines) {
+            service.handleStreamingEvent(callback, 123, "data: " + line);
+        }
+        assertEquals("Hello!", result.toString());
+        verify(callback).onFinish(GPTFinishReason.STOP);
+        verify(callback).close();
     }
 
 }
diff --git a/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImplToolsTest.java b/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImplToolsTest.java
new file mode 100644
index 000000000..37db36ae3
--- /dev/null
+++ b/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTChatCompletionServiceImplToolsTest.java
@@ -0,0 +1,74 @@
+package com.composum.ai.backend.base.service.chat.impl;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.osgi.framework.BundleContext;
+
+import com.composum.ai.backend.base.service.chat.GPTChatCompletionService;
+import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
+import com.composum.ai.backend.base.service.chat.GPTFinishReason;
+import com.composum.ai.backend.base.service.chat.GPTToolCall;
+import com.composum.ai.backend.base.service.chat.impl.chatmodel.ChatCompletionToolCall;
+
+/**
+ * Tests for {@link GPTChatCompletionService} with tool calls.
+ */
+public class GPTChatCompletionServiceImplToolsTest {
+
+    protected GPTChatCompletionServiceImpl service = new GPTChatCompletionServiceImpl();
+    private GPTChatCompletionServiceImpl.GPTChatCompletionServiceConfig config =
+            mock(GPTChatCompletionServiceImpl.GPTChatCompletionServiceConfig.class);
+    private BundleContext bundleContext = mock(BundleContext.class);
+
+    @Before
+    public void setUp() {
+        Mockito.when(config.openAiApiKey()).thenReturn("sk-abcdefg");
+        service.activate(config, bundleContext);
+    }
+
+    /**
+     * Streaming test from real example.
+     */
+    @Test
+    public void testHandleStreamingEventWithToolCall() {
+        String[] lines = ("" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"role\":\"assistant\",\"content\":null},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":0,\"id\":\"call_bZrlWEFQ7jbTybVQYHg0hDSn\",\"type\":\"function\",\"function\":{\"name\":\"wobbler\",\"arguments\":\"\"}}]},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"{\\\"to\"}}]},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"wobbl\"}}]},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"e\\\": \\\"h\"}}]},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":0,\"function\":{\"arguments\":\"i\\\"}\"}}]},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":1,\"id\":\"call_om4hHNguyKYCOkhiZu6wo9xA\",\"type\":\"function\",\"function\":{\"name\":\"wobbler\",\"arguments\":\"\"}}]},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":1,\"function\":{\"arguments\":\"{\\\"to\"}}]},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":1,\"function\":{\"arguments\":\"wobbl\"}}]},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":1,\"function\":{\"arguments\":\"e\\\": \\\"h\"}}]},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{\"tool_calls\":[{\"index\":1,\"function\":{\"arguments\":\"o\\\"}\"}}]},\"logprobs\":null,\"finish_reason\":null}]}\n" +
+                "{\"id\":\"chatcmpl-ANM95HYArFdhLHNSljHzHawXXAiXT\",\"object\":\"chat.completion.chunk\",\"created\":1730130035,\"model\":\"gpt-4o-mini-2024-07-18\",\"system_fingerprint\":\"fp_8bfc6a7dc2\",\"choices\":[{\"index\":0,\"delta\":{},\"logprobs\":null,\"finish_reason\":\"tool_calls\"}]}\n" +
+                "[DONE]"
+        ).split("\n");
+        GPTCompletionCallback.GPTCompletionCollector callback = new GPTCompletionCallback.GPTCompletionCollector();
+        for (String line : lines) {
+            service.handleStreamingEvent(callback, 123, "data: " + line);
+        }
+        assertEquals(GPTFinishReason.TOOL_CALLS, callback.getFinishReason());
+        List<GPTToolCall> calls = callback.getToolCalls();
+        assertEquals(2, calls.size());
+        assertEquals("call_bZrlWEFQ7jbTybVQYHg0hDSn", calls.get(0).getId());
+        assertEquals("wobbler", calls.get(0).getFunction().getName());
+        assertEquals("{\"towobble\": \"hi\"}", calls.get(0).getFunction().getArguments());
+        assertEquals("call_om4hHNguyKYCOkhiZu6wo9xA", calls.get(1).getId());
+        assertEquals("wobbler", calls.get(1).getFunction().getName());
+        assertEquals("{\"towobble\": \"ho\"}", calls.get(1).getFunction().getArguments());
+    }
+
+}
diff --git a/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTTranslationServiceImplTest.java b/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTTranslationServiceImplTest.java
index f2153a697..023b85998 100644
--- a/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTTranslationServiceImplTest.java
+++ b/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/GPTTranslationServiceImplTest.java
@@ -33,6 +33,7 @@
 
 import com.composum.ai.backend.base.service.GPTException;
 import com.composum.ai.backend.base.service.chat.GPTChatCompletionService;
+import com.composum.ai.backend.base.service.chat.GPTChatMessagesTemplate;
 import com.composum.ai.backend.base.service.chat.GPTChatRequest;
 import com.composum.ai.backend.base.service.chat.GPTConfiguration;
 import com.composum.ai.backend.base.service.chat.GPTResponseCheck;
@@ -138,9 +139,23 @@ public void testFakeTranslation() {
         assertEquals("", fakeTranslation(""));
         String faked = fakeTranslation("This is a test <code>and some Code</code>");
         assertEquals("this is a test <code>and some code</code>", faked.toLowerCase());
+        assertFalse("this is a test <code>and some code</code>".equals(faked)); // different case
         System.out.println(faked); // random case; that's a bit hard to test
     }
 
+    /**
+     * Fake translation should not break the structure for translating multiple texts.
+     */
+    @Test
+    public void testFakeTranslationKeepsStructure() {
+        String result = "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 357056 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" +
+                "12 34 56\n" +
+                "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 566470 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n" +
+                "999 99 99 +-*/.\n" +
+                "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 424242 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%";
+        assertEquals(result, fakeTranslation(result));
+    }
+
     @Test
     public void testFakeTranslationDoesntTouchURLs() {
         String text = "This is a test <a href=\"https://www.composum.com\">and some Code</a>";
@@ -152,14 +167,20 @@ public void testFakeTranslationDoesntTouchURLs() {
 
     @Test
     public void testFakedFragmentedTranslation() {
-        GPTTranslationServiceImpl service = new GPTTranslationServiceImpl();
+        GPTChatCompletionService completionService = mock(GPTChatCompletionService.class);
+        when(completionService.getTemplate(TEMPLATE_SINGLETRANSLATION)).thenReturn(
+                new GPTChatMessagesTemplate(GPTChatCompletionServiceImpl.class.getClassLoader(), TEMPLATE_SINGLETRANSLATION)
+        );
+        GPTTranslationServiceImpl service = new GPTTranslationServiceImpl() {{
+            this.chatCompletionService = completionService;
+        }};
         GPTTranslationServiceImpl.Config config = mock(GPTTranslationServiceImpl.Config.class);
         when(config.fakeTranslation()).thenReturn(true);
         service.activate(config);
-        assertTrue(service.fragmentedTranslation(null, null, null).isEmpty());
-        assertTrue(service.fragmentedTranslation(asList(), null, null).isEmpty());
-        assertEquals(Arrays.asList("", "\n", "holla", "").toString(), service.fragmentedTranslation(asList("", "\n", "holla", ""), null, null).toString().toLowerCase());
-        assertEquals(Arrays.asList("holla", "\nmiau ho ho ").toString(), service.fragmentedTranslation(asList("holla", "\nmiau ho Ho "), null, null).toString().toLowerCase());
+        assertTrue(service.fragmentedTranslation(null, "de", null).isEmpty());
+        assertTrue(service.fragmentedTranslation(asList(), "de", null).isEmpty());
+        assertEquals(Arrays.asList("", "\n", "holla", "").toString(), service.fragmentedTranslation(asList("", "\n", "holla", ""), "de", null).toString().toLowerCase());
+        assertEquals(Arrays.asList("holla", "\nmiau ho ho ").toString(), service.fragmentedTranslation(asList("holla", "\nmiau ho Ho "), "de", null).toString().toLowerCase());
 
         assertEquals(null, service.singleTranslation(null, null, "de", null));
         assertEquals("", service.singleTranslation("", null, "de", null));
diff --git a/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/RunGPTChatCompletionServiceImplWithTools.java b/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/RunGPTChatCompletionServiceImplWithTools.java
new file mode 100644
index 000000000..b84414a14
--- /dev/null
+++ b/backend/base/src/test/java/com/composum/ai/backend/base/service/chat/impl/RunGPTChatCompletionServiceImplWithTools.java
@@ -0,0 +1,168 @@
+package com.composum.ai.backend.base.service.chat.impl;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import com.composum.ai.backend.base.service.chat.GPTChatRequest;
+import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
+import com.composum.ai.backend.base.service.chat.GPTConfiguration;
+import com.composum.ai.backend.base.service.chat.GPTFinishReason;
+import com.composum.ai.backend.base.service.chat.GPTMessageRole;
+import com.composum.ai.backend.base.service.chat.GPTTool;
+import com.composum.ai.backend.base.service.chat.GPTToolCall;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
+/**
+ * Tries an actual call to ChatGPT with the streaming interface. Since that costs money (though much less than a cent),
+ * needs a secret key and takes a couple of seconds, we don't do that as an JUnit test.
+ */
+public class RunGPTChatCompletionServiceImplWithTools extends AbstractGPTRunner implements GPTCompletionCallback {
+
+    StringBuilder buffer = new StringBuilder();
+    Gson gson = new GsonBuilder().setPrettyPrinting().create();
+    private boolean isFinished;
+    List<GPTToolCall> toolCalls;
+
+    public static void main(String[] args) throws Exception {
+        RunGPTChatCompletionServiceImplWithTools instance;
+        if (0 == 1) {
+            instance = new RunGPTChatCompletionServiceImplWithTools();
+            instance.setup();
+            instance.runWithoutAutomaticCall();
+            instance.teardown();
+            System.out.println("######################### Done without automatic call #########################");
+        }
+
+        instance = new RunGPTChatCompletionServiceImplWithTools();
+        instance.setup();
+        instance.runWithAutomaticCall();
+        instance.teardown();
+        System.out.println("######################### Done. ######################### ");
+    }
+
+    private void runWithoutAutomaticCall() throws InterruptedException {
+        GPTChatRequest request = makeRequest();
+        chatCompletionService.streamingChatCompletion(request, this);
+        System.out.println("Call returned.");
+        while (!isFinished) Thread.sleep(1000);
+        System.out.println("Complete response:");
+        System.out.println(buffer);
+        System.out.println("Tool calls:");
+        System.out.println(gson.toJson(toolCalls));
+    }
+
+    private void runWithAutomaticCall() throws InterruptedException {
+        GPTChatRequest request = makeRequest();
+        chatCompletionService.streamingChatCompletionWithToolCalls(request, this);
+        System.out.println("Call returned.");
+        while (!isFinished) Thread.sleep(1000);
+        System.out.println("Complete response:");
+        System.out.println(buffer);
+    }
+
+    private GPTChatRequest makeRequest() {
+        GPTChatRequest request = new GPTChatRequest();
+        request.addMessage(GPTMessageRole.USER, "Wobble the string 'hihihi' and the string 'houhou'.");
+        request.setConfiguration(GPTConfiguration.ofTools(Arrays.asList(wobbler)));
+        return request;
+    }
+
+    @Override
+    public void onFinish(GPTFinishReason finishReason) {
+        isFinished = true;
+        System.out.println();
+        System.out.println("Finished: " + finishReason);
+    }
+
+    @Override
+    public void setLoggingId(String loggingId) {
+        System.out.println("Logging ID: " + loggingId);
+    }
+
+    @Override
+    public GPTToolExecutionContext getToolExecutionContext() {
+        return null;
+    }
+
+    @Override
+    public void onNext(String item) {
+        buffer.append(item);
+        System.out.print(item);
+    }
+
+    @Override
+    public void onError(Throwable throwable) {
+        throwable.printStackTrace(System.err);
+        isFinished = true;
+    }
+
+    @Override
+    public void toolDelta(List<GPTToolCall> toolCalls) {
+        this.toolCalls = GPTToolCall.mergeDelta(this.toolCalls, toolCalls);
+    }
+
+    protected GPTTool wobbler = new GPTTool() {
+        @Override
+        public String getName() {
+            return "wobbler";
+        }
+
+        @Override
+        public String getToolDeclaration() {
+            return "{\n" +
+                    "  \"type\": \"function\",\n" +
+                    "  \"function\": {\n" +
+                    "    \"name\": \"wobbler\",\n" +
+                    "    \"description\": \"wobbles the string given as argument\",\n" +
+                    "    \"parameters\": {\n" +
+                    "      \"type\": \"object\",\n" +
+                    "      \"properties\": {\n" +
+                    "        \"towobble\": {\n" +
+                    "          \"type\": \"string\",\n" +
+                    "          \"description\": \"The string to wobble.\"\n" +
+                    "        }\n" +
+                    "      },\n" +
+                    "      \"required\": [\"towobble\"],\n" +
+                    "      \"additionalProperties\": false\n" +
+                    "    }\n" +
+                    "  },\n" +
+                    "  \"strict\": true\n" +
+                    "}";
+        }
+
+        @Override
+        public String execute(String arguments, GPTToolExecutionContext context) {
+            Map parsedArguments = gson.fromJson(arguments, Map.class);
+            String towobble = (String) parsedArguments.get("towobble");
+            StringBuilder result = new StringBuilder();
+            for (int i = 0; i < towobble.length(); i++) {
+                char c = towobble.charAt(i);
+                if (i % 2 == 0) {
+                    result.append(Character.toUpperCase(c));
+                } else {
+                    result.append(Character.toLowerCase(c));
+                }
+            }
+            return result.toString();
+        }
+    };
+
+}
+// sequence of data for a tool call:
+//  {"id":"chatcmpl-AIXBVjvIrBwLMcdUfqBsCEVwteQuK","object":"chat.completion.chunk","created":1728980829,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{"role":"assistant","content":null,"tool_calls":[{"index":0,"id":"call_ZkuSWztTvaOxQeT6TFITm3sa","type":"function","function":{"name":"wobbler","arguments":""}}],"refusal":null},"logprobs":null,"finish_reason":null}]}
+// {"id":"chatcmpl-AIXBVjvIrBwLMcdUfqBsCEVwteQuK","object":"chat.completion.chunk","created":1728980829,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{"tool_calls":[{"index":0,"function":{"arguments":"{\""}}]},"logprobs":null,"finish_reason":null}]}
+// {"id":"chatcmpl-AIXBVjvIrBwLMcdUfqBsCEVwteQuK","object":"chat.completion.chunk","created":1728980829,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{"tool_calls":[{"index":0,"function":{"arguments":"tow"}}]},"logprobs":null,"finish_reason":null}]}
+// {"id":"chatcmpl-AIXBVjvIrBwLMcdUfqBsCEVwteQuK","object":"chat.completion.chunk","created":1728980829,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{"tool_calls":[{"index":0,"function":{"arguments":"ob"}}]},"logprobs":null,"finish_reason":null}]}
+// {"id":"chatcmpl-AIXBVjvIrBwLMcdUfqBsCEVwteQuK","object":"chat.completion.chunk","created":1728980829,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{"tool_calls":[{"index":0,"function":{"arguments":"ble"}}]},"logprobs":null,"finish_reason":null}]}
+// {"id":"chatcmpl-AIXBVjvIrBwLMcdUfqBsCEVwteQuK","object":"chat.completion.chunk","created":1728980829,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{"tool_calls":[{"index":0,"function":{"arguments":"\":\""}}]},"logprobs":null,"finish_reason":null}]}
+// {"id":"chatcmpl-AIXBVjvIrBwLMcdUfqBsCEVwteQuK","object":"chat.completion.chunk","created":1728980829,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{"tool_calls":[{"index":0,"function":{"arguments":"hi"}}]},"logprobs":null,"finish_reason":null}]}
+// {"id":"chatcmpl-AIXBVjvIrBwLMcdUfqBsCEVwteQuK","object":"chat.completion.chunk","created":1728980829,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{"tool_calls":[{"index":0,"function":{"arguments":"\"}"}}]},"logprobs":null,"finish_reason":null}]}
+// {"id":"chatcmpl-AIXBVjvIrBwLMcdUfqBsCEVwteQuK","object":"chat.completion.chunk","created":1728980829,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{},"logprobs":null,"finish_reason":"tool_calls"}]}
+// [DONE]
+
+// or two calls:
+//  {"id":"chatcmpl-AIgs1gFG3stX6MiLD2jQkeam50HJQ","object":"chat.completion.chunk","created":1729018061,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{"tool_calls":[{"index":0,"id":"call_g44GU4kWpf8Q8T3pCmB54GWa","type":"function","function":{"name":"wobbler","arguments":""}}]},"logprobs":null,"finish_reason":null}]}
+// ... and then ...
+//  {"id":"chatcmpl-AIgs1gFG3stX6MiLD2jQkeam50HJQ","object":"chat.completion.chunk","created":1729018061,"model":"gpt-4o-mini-2024-07-18","system_fingerprint":"fp_e2bde53e6e","choices":[{"index":0,"delta":{"tool_calls":[{"index":1,"function":{"arguments":"o\"}"}}]},"logprobs":null,"finish_reason":null}]}
diff --git a/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/AICreateServlet.java b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/AICreateServlet.java
index edbea16dd..9bf439014 100644
--- a/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/AICreateServlet.java
+++ b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/AICreateServlet.java
@@ -16,6 +16,7 @@
 import java.util.stream.Stream;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletResponse;
@@ -33,6 +34,8 @@
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,6 +44,9 @@
 import com.composum.ai.backend.base.service.chat.GPTConfiguration;
 import com.composum.ai.backend.base.service.chat.GPTContentCreationService;
 import com.composum.ai.backend.base.service.chat.GPTMessageRole;
+import com.composum.ai.backend.base.service.chat.GPTTool;
+import com.composum.ai.backend.slingbase.experimential.AITool;
+import com.composum.ai.backend.slingbase.model.SlingGPTExecutionContext;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonSyntaxException;
@@ -130,10 +136,25 @@ public class AICreateServlet extends SlingAllMethodsServlet {
     @Reference
     protected AIConfigurationService configurationService;
 
+    protected List<AITool> tools = Collections.synchronizedList(new ArrayList<>());
+
     protected BundleContext bundleContext;
 
     protected Gson gson = new GsonBuilder().disableHtmlEscaping().create();
 
+    @Reference(service = AITool.class, policy = ReferencePolicy.DYNAMIC,
+            cardinality = ReferenceCardinality.MULTIPLE)
+    protected void addTool(@NotNull final AITool tool) {
+        LOG.info("addTool: {}", tool.getToolName());
+        tools.add(tool);
+    }
+
+    protected void removeTool(@NotNull final AITool tool) {
+        LOG.info("removeTool: {}", tool.getToolName());
+        tools.remove(tool);
+    }
+
+
     @Activate
     public void activate(final BundleContext bundleContext) {
         this.bundleContext = bundleContext;
@@ -187,6 +208,7 @@ protected void doGet(@NotNull SlingHttpServletRequest request, @NotNull SlingHtt
         if (stream == null) {
             response.sendError(HttpServletResponse.SC_GONE, "Stream " + streamId + " not found (anymore?)");
         } else {
+            stream.setContext(new SlingGPTExecutionContext(request, response));
             response.setCharacterEncoding("UTF-8");
             response.setContentType("text/event-stream");
             response.setHeader("Cache-Control", "no-cache");
@@ -259,6 +281,7 @@ protected void doPost(@NotNull SlingHttpServletRequest request, @NotNull SlingHt
         if ("undefined".equals(inputImagePath) || "null".equals(inputImagePath) || StringUtils.isBlank(inputImagePath)) {
             inputImagePath = null;
         }
+
         GPTConfiguration config = configurationService.getGPTConfiguration(request.getResourceResolver(), configBasePath);
         String chat = request.getParameter(PARAMETER_CHAT);
         if (Stream.of(sourcePath, sourceText, inputImagePath).filter(StringUtils::isNotBlank).count() > 1) {
@@ -268,6 +291,7 @@ protected void doPost(@NotNull SlingHttpServletRequest request, @NotNull SlingHt
                     " given, only one of them is allowed");
             return;
         }
+
         boolean richtext = Boolean.TRUE.toString().equalsIgnoreCase(request.getParameter(PARAMETER_RICHTEXT));
         GPTConfiguration mergedConfig = GPTConfiguration.ofRichText(richtext).merge(config);
         Integer maxTokensParam = getOptionalInt(request, response, PARAMETER_MAXTOKENS);
@@ -281,6 +305,12 @@ protected void doPost(@NotNull SlingHttpServletRequest request, @NotNull SlingHt
                 textLength = matcher.group(2);
             }
         }
+
+        List<GPTTool> tools = collectTools(request.getResourceResolver().getResource(configBasePath), request, response);
+        if (tools != null && !tools.isEmpty()) {
+            mergedConfig = GPTConfiguration.ofTools(tools).merge(mergedConfig);
+        }
+
         GPTChatRequest additionalParameters = makeAdditionalParameters(maxtokens, chat, response, mergedConfig);
 
         String fullPrompt = prompt;
@@ -351,4 +381,19 @@ protected GPTChatRequest makeAdditionalParameters(int maxtokens, String chat, Ht
         return additionalParameters;
     }
 
+    @Nullable
+    protected List<GPTTool> collectTools(@Nonnull Resource resource,
+                                         @Nonnull SlingHttpServletRequest request, @Nonnull SlingHttpServletResponse response) {
+        if (tools == null || tools.isEmpty()) {
+            return null;
+        }
+        List<GPTTool> tools = new ArrayList<>();
+        for (AITool tool : this.tools) {
+            if (tool.isAllowedFor(resource)) {
+                tools.add(tool.makeGPTTool(resource, request, response));
+            }
+        }
+        return tools;
+    }
+
 }
diff --git a/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/EventStream.java b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/EventStream.java
index 4be0344f3..f63263c54 100644
--- a/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/EventStream.java
+++ b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/EventStream.java
@@ -20,6 +20,7 @@
 import com.composum.ai.backend.base.service.StringstreamSlowdown;
 import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
 import com.composum.ai.backend.base.service.chat.GPTFinishReason;
+import com.composum.ai.backend.slingbase.model.SlingGPTExecutionContext;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -49,6 +50,8 @@ public class EventStream implements GPTCompletionCallback {
 
     private final StringstreamSlowdown slowdown = new StringstreamSlowdown(this::writeData, 250);
 
+    private SlingGPTExecutionContext context;
+
     public void setId(String id) {
         this.id = id;
     }
@@ -163,4 +166,14 @@ public void onError(Throwable throwable) {
         queue.add("");
         queue.add(QUEUEEND);
     }
+
+    public void setContext(SlingGPTExecutionContext context) {
+        this.context = context;
+    }
+
+    @Override
+    public SlingGPTExecutionContext getToolExecutionContext() {
+        return context;
+    }
+
 }
diff --git a/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/experimential/AITool.java b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/experimential/AITool.java
new file mode 100644
index 000000000..94c19e864
--- /dev/null
+++ b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/experimential/AITool.java
@@ -0,0 +1,110 @@
+package com.composum.ai.backend.slingbase.experimential;
+
+import java.util.Locale;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.Resource;
+
+import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
+import com.composum.ai.backend.base.service.chat.GPTCompletionCallback.GPTToolExecutionContext;
+import com.composum.ai.backend.base.service.chat.GPTTool;
+
+/**
+ * An action the AI can perform - likely from the sidebar chat.
+ *
+ * @see "https://platform.openai.com/docs/guides/function-calling"
+ */
+public interface AITool {
+
+    /**
+     * Human readable name.
+     */
+    @Nonnull
+    String getName(@Nullable Locale locale);
+
+    /**
+     * Human readable description.
+     */
+    @Nonnull
+    String getDescription(@Nullable Locale locale);
+
+    /**
+     * Name for the purpose of calling - must match {@link #getToolDeclaration()}.
+     */
+    @Nonnull
+    String getToolName();
+
+    /**
+     * The description to use for the OpenAI tool call. Will be inserted into the OpenAI tools array. E.g.:
+     * <code><pre>
+     *       {
+     *         "type": "function",
+     *         "function": {
+     *           "name": "get_delivery_date",
+     *           "description": "Get the delivery date for a customer's order. Call this whenever you need to know the delivery date, for example when a customer asks 'Where is my package'",
+     *           "parameters": {
+     *             "type": "object",
+     *             "properties": {
+     *               "order_id": {
+     *                 "type": "string",
+     *                 "description": "The customer's order ID."
+     *               }
+     *             },
+     *             "required": ["order_id"],
+     *             "additionalProperties": false
+     *           }
+     *         },
+     *         "strict": true
+     *       }
+     * </pre></code>
+     *
+     * @see "https://platform.openai.com/docs/api-reference/chat/create"
+     */
+    @Nonnull
+    String getToolDeclaration();
+
+    /**
+     * Whether the tool is enabled for the given resource.
+     */
+    boolean isAllowedFor(@Nonnull Resource resource);
+
+    /**
+     * Executes the tool call and returns the result to present to the AI.
+     * Must only be called if {@link #isAllowedFor(Resource)} returned true.
+     */
+    @Nonnull
+    String execute(@Nullable String arguments, @Nonnull Resource resource,
+                   @Nullable GPTCompletionCallback.GPTToolExecutionContext context);
+
+    /**
+     * The form useable by {@link com.composum.ai.backend.base.service.chat.GPTChatCompletionService}.
+     */
+    @Nullable
+    default GPTTool makeGPTTool(@Nonnull Resource resource,
+                       @Nonnull SlingHttpServletRequest request, @Nonnull SlingHttpServletResponse response) {
+        if (!isAllowedFor(resource)) {
+            return null;
+        }
+        return new GPTTool() {
+            @Override
+            public @Nonnull String getName() {
+                return AITool.this.getToolName();
+            }
+
+            @Override
+            public @Nonnull String getToolDeclaration() {
+                return AITool.this.getToolDeclaration();
+            }
+
+            @Override
+            public @Nonnull String execute(@Nullable String arguments, @Nullable GPTToolExecutionContext context) {
+                return AITool.this.execute(arguments, resource, context);
+            }
+        };
+    }
+
+}
diff --git a/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/experimential/impl/GetPageMarkdownAITool.java b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/experimential/impl/GetPageMarkdownAITool.java
new file mode 100644
index 000000000..b14f4190e
--- /dev/null
+++ b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/experimential/impl/GetPageMarkdownAITool.java
@@ -0,0 +1,136 @@
+package com.composum.ai.backend.slingbase.experimential.impl;
+
+import java.util.Locale;
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
+import com.composum.ai.backend.slingbase.ApproximateMarkdownService;
+import com.composum.ai.backend.slingbase.experimential.AITool;
+import com.composum.ai.backend.slingbase.model.SlingGPTExecutionContext;
+import com.google.gson.Gson;
+
+@Component(service = AITool.class, configurationPolicy = ConfigurationPolicy.REQUIRE)
+@Designate(ocd = GetPageMarkdownAITool.Config.class)
+public class GetPageMarkdownAITool implements AITool {
+    private static final Logger LOG = LoggerFactory.getLogger(GetPageMarkdownAITool.class);
+    private Config config;
+    private Gson gson = new Gson();
+
+    @Reference
+    private ApproximateMarkdownService markdownService;
+
+    @Override
+    public @Nonnull String getName(@Nullable Locale locale) {
+        return "Get Text of Page";
+    }
+
+    @Override
+    public @Nonnull String getDescription(@Nullable Locale locale) {
+        return "Returns a markdown representation of the text of a given page";
+    }
+
+    @Override
+    public @Nonnull String getToolName() {
+        return "get_pagetext";
+    }
+
+    @Override
+    public @Nonnull String getToolDeclaration() {
+        return "{\n" +
+                "  \"type\": \"function\",\n" +
+                "  \"function\": {\n" +
+                "    \"name\": \"get_pagetext\",\n" +
+                "    \"description\": \"Get the text of a page with a given path.\",\n" +
+                "    \"parameters\": {\n" +
+                "      \"type\": \"object\",\n" +
+                "      \"properties\": {\n" +
+                "        \"path\": {\n" +
+                "          \"type\": \"string\",\n" +
+                "          \"description\": \"The path of the page to get the text of.\"\n" +
+                "        }\n" +
+                "      },\n" +
+                "      \"required\": [\"path\"],\n" +
+                "      \"additionalProperties\": false\n" +
+                "    }\n" +
+                "  },\n" +
+                "  \"strict\": true\n" +
+                "}";
+    }
+
+    @Override
+    public boolean isAllowedFor(@Nonnull Resource resource) {
+        return config != null && config.allowedPathsRegex() != null &&
+                config.allowedPathsRegex().matches(resource.getPath());
+    }
+
+    /**
+     * Does a query with lucene and then rates the results with the embedding.
+     */
+    @Override
+    public @Nonnull String execute(@Nullable String arguments, @Nonnull Resource resource,
+                                   @Nullable GPTCompletionCallback.GPTToolExecutionContext context) {
+        try {
+            SlingHttpServletRequest request = ((SlingGPTExecutionContext) context).getRequest();
+            SlingHttpServletResponse response = ((SlingGPTExecutionContext) context).getResponse();
+            Map parsedArguments = gson.fromJson(arguments, Map.class);
+            String path = (String) parsedArguments.get("path");
+            if (path == null || path.isEmpty()) {
+                return "Missing path parameter";
+            }
+            if (!config.allowedPathsRegex().matches(path)) {
+                return "Path not allowed";
+            }
+            ResourceResolver resolver = resource.getResourceResolver();
+            Resource pathResource = resolver.getResource(path);
+            String markdown = markdownService.approximateMarkdown(pathResource, request, response);
+            LOG.debug("Markdown of {} : {}", path, StringUtils.abbreviate(markdown, 80));
+            return markdown;
+        } catch (Exception e) {
+            LOG.error("Error in search page AI tool", e);
+            return "Error in search page AI tool: " + e;
+        }
+    }
+
+    // activate and deactivate methods
+    @Activate
+    @Modified
+    protected void activate(Config config) {
+        this.config = config;
+    }
+
+    @Deactivate
+    protected void deactivate() {
+        this.config = null;
+    }
+
+    @ObjectClassDefinition(name = "Composum AI Tool Get Page Markdown",
+            description = "Provides the AI with a tool to search for page paths. Needs a lucene index for all pages." +
+                    "If there is no configuration, the tool is not active.")
+    public @interface Config {
+
+        @AttributeDefinition(name = "Allowed paths regex",
+                description = "A regex to match the paths that this tool is allowed to be used on. Default: /content/.*")
+        String allowedPathsRegex() default "/content/.*";
+
+    }
+}
diff --git a/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/experimential/impl/SearchPageAITool.java b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/experimential/impl/SearchPageAITool.java
new file mode 100644
index 000000000..0fd71912e
--- /dev/null
+++ b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/experimential/impl/SearchPageAITool.java
@@ -0,0 +1,163 @@
+package com.composum.ai.backend.slingbase.experimential.impl;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.ConfigurationPolicy;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.metatype.annotations.AttributeDefinition;
+import org.osgi.service.metatype.annotations.Designate;
+import org.osgi.service.metatype.annotations.ObjectClassDefinition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
+import com.composum.ai.backend.slingbase.RAGService;
+import com.composum.ai.backend.slingbase.experimential.AITool;
+import com.composum.ai.backend.slingbase.model.SlingGPTExecutionContext;
+import com.google.gson.Gson;
+
+@Component(service = AITool.class, configurationPolicy = ConfigurationPolicy.REQUIRE)
+@Designate(ocd = SearchPageAITool.Config.class)
+public class SearchPageAITool implements AITool {
+    private static final Logger LOG = LoggerFactory.getLogger(SearchPageAITool.class);
+    private Config config;
+    private final Gson gson = new Gson();
+
+    @Reference
+    private RAGService ragService;
+
+    @Override
+    public @Nonnull String getName(@Nullable Locale locale) {
+        return "Search Page";
+    }
+
+    @Override
+    public @Nonnull String getDescription(@Nullable Locale locale) {
+        return "Search for a page";
+    }
+
+    @Override
+    public @Nonnull String getToolName() {
+        return "search_page";
+    }
+
+    @Override
+    public @Nonnull String getToolDeclaration() {
+        return "{\n" +
+                "  \"type\": \"function\",\n" +
+                "  \"function\": {\n" +
+                "    \"name\": \"search_page\",\n" +
+                "    \"description\": \"Search for titles and JCR paths for pages that best match the given query.\",\n" +
+                "    \"parameters\": {\n" +
+                "      \"type\": \"object\",\n" +
+                "      \"properties\": {\n" +
+                "        \"query\": {\n" +
+                "          \"type\": \"string\",\n" +
+                "          \"description\": \"The search query\"\n" +
+                "        }\n" +
+                "      },\n" +
+                "      \"required\": [\"query\"],\n" +
+                "      \"additionalProperties\": false\n" +
+                "    }\n" +
+                "  },\n" +
+                "  \"strict\": true\n" +
+                "}";
+    }
+
+    @Override
+    public boolean isAllowedFor(@Nonnull Resource resource) {
+        return true;
+    }
+
+    /**
+     * Does a query with lucene and then rates the results with the embedding.
+     */
+    @Override
+    public @Nonnull String execute(@Nullable String arguments, @Nonnull Resource resource,
+                                   @Nullable GPTCompletionCallback.GPTToolExecutionContext context) {
+        try {
+            SlingHttpServletRequest request = ((SlingGPTExecutionContext) context).getRequest();
+            SlingHttpServletResponse response = ((SlingGPTExecutionContext) context).getResponse();
+            Map parsedArguments = gson.fromJson(arguments, Map.class);
+            String query = (String) parsedArguments.get("query");
+            if (query == null || query.isEmpty()) {
+                return "Missing query parameter";
+            }
+            ResourceResolver resolver = request.getResourceResolver();
+            // go up to site resource starting from resource
+            Resource rootResource = resolver.getResource(resource.getPath()); // original resource resolver is already closed.
+            while (rootResource != null && rootResource.getPath().split("/").length > config.siteLevel() + 1) {
+                rootResource = rootResource.getParent();
+            }
+
+            List<String> paths = ragService.searchRelated(rootResource, query, config.resultCount());
+            List<Resource> resources = paths.stream().map(resolver::getResource).collect(Collectors.toList());
+            List<Resource> ordered = ragService.orderByEmbedding(query, resources, request, response, rootResource);
+            List<String> resultPaths = ordered.stream().map(Resource::getPath)
+                    .map(path -> path.replaceAll("/jcr:content$", ""))
+                    .collect(Collectors.toList());
+            LOG.debug("Search page AI tool found for '{}' at {} : {}", query, rootResource.getPath(), resultPaths);
+
+            // collect titles (properties "jcr:title" / "title") of resource and make itemized list of markdown links
+            StringBuilder result = new StringBuilder("Here are the AEM JCR paths for the " + config.resultCount() +
+                    " pages best matching the query. They should be printed as root-relative URLs but can be turned into full URLs by adding them as a suffix after http://localhost:4502/ , but do not print that information. DO NOT change the returned links into full URLs - print them as root-relative URLs starting with /content! They will automatically be translated into full URLs later.\n\n");
+            for (String path : resultPaths) {
+                Resource res = resolver.getResource(path);
+                if (res != null) {
+                    res = res.getChild("jcr:content") != null ? res.getChild("jcr:content") : res;
+                    String title = res.getValueMap().get("jcr:title",
+                            res.getValueMap().get("title", String.class));
+                    if (title == null || title.startsWith("/")) {
+                        result.append("- ").append(path).append("\n");
+                    } else {
+                        result.append("- [").append(title).append("](").append(path).append(")\n");
+                    }
+                } else {
+                    result.append("- ").append(path).append("\n");
+                }
+            }
+            return result.toString();
+        } catch (Exception e) {
+            LOG.error("Error in search page AI tool", e);
+            return "Error in search page AI tool: " + e;
+        }
+    }
+
+    @Activate
+    @Modified
+    protected void activate(Config config) {
+        this.config = config;
+    }
+
+    @Deactivate
+    protected void deactivate() {
+        this.config = null;
+    }
+
+    @ObjectClassDefinition(name = "Composum AI Tool Search Pages",
+            description = "Provides the AI with a tool to search for page paths. Needs a lucene index for all pages." +
+                    "If there is no configuration the tool is not active.")
+    public @interface Config {
+
+        @AttributeDefinition(name = "Result count", description = "The number of results to return. Default is 20.")
+        int resultCount() default 20;
+
+        @AttributeDefinition(name = "Site level", description = "The number of path segments a site has, used to identify the site root. Default is 2, for sites like /content/my-site.")
+        int siteLevel() default 2;
+
+    }
+}
diff --git a/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/model/SlingGPTExecutionContext.java b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/model/SlingGPTExecutionContext.java
new file mode 100644
index 000000000..54e7c6bb1
--- /dev/null
+++ b/backend/slingbase/src/main/java/com/composum/ai/backend/slingbase/model/SlingGPTExecutionContext.java
@@ -0,0 +1,36 @@
+package com.composum.ai.backend.slingbase.model;
+
+import javax.annotation.Nonnull;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.api.SlingHttpServletResponse;
+
+import com.composum.ai.backend.base.service.chat.GPTCompletionCallback;
+
+/**
+ * For Sling tools: the request and response of the streaming as executin context for tool calls.
+ */
+public class SlingGPTExecutionContext implements GPTCompletionCallback.GPTToolExecutionContext {
+
+    @Nonnull
+    private final SlingHttpServletRequest request;
+
+    @Nonnull
+    private final SlingHttpServletResponse response;
+
+    public SlingGPTExecutionContext(@Nonnull SlingHttpServletRequest request, @Nonnull SlingHttpServletResponse response) {
+        this.request = request;
+        this.response = response;
+    }
+
+    @Nonnull
+    public SlingHttpServletRequest getRequest() {
+        return request;
+    }
+
+    @Nonnull
+    public SlingHttpServletResponse getResponse() {
+        return response;
+    }
+
+}
diff --git a/composum/bundle/src/main/java/com/composum/ai/composum/bundle/model/TranslationDialogModel.java b/composum/bundle/src/main/java/com/composum/ai/composum/bundle/model/TranslationDialogModel.java
index 196576e24..b903a1a78 100644
--- a/composum/bundle/src/main/java/com/composum/ai/composum/bundle/model/TranslationDialogModel.java
+++ b/composum/bundle/src/main/java/com/composum/ai/composum/bundle/model/TranslationDialogModel.java
@@ -119,7 +119,7 @@ protected PropertyEditHandle<String> makePropertyEditHandle(BeanContext context,
         Objects.requireNonNull(propertyI18nPath);
         PropertyEditHandle<String> handle = new PropertyEditHandle(String.class);
         handle.setProperty(propertyName, propertyI18nPath, true);
-        // FIXME(hps,04.05.23) how to determine that?
+        // TODO(hps,04.05.23) how to determine that?
         handle.setMultiValue(false);
         handle.initialize(context, this.resource);
         // propertyEditHandle: resource e.g. /content/ist/software/home/test/jcr:content/main/text , propertyName = propertyPath = title
diff --git a/composum/config/pom.xml b/composum/config/pom.xml
index 383f27ead..0a083c854 100644
--- a/composum/config/pom.xml
+++ b/composum/config/pom.xml
@@ -74,16 +74,6 @@
                                 </include>
                             </includes>
                         </filter>
-
-                        <filter>
-                            <!-- Cleanup obsolete path. FIXME: remove in version 0.5.x -->
-                            <root>/libs/composum/ai/install</root>
-                            <includes>
-                                <include>
-                                    .*/com.composum.ai.backend.base.service.chat.impl.GPTChatCompletionServiceImpl.*
-                                </include>
-                            </includes>
-                        </filter>
                     </filters>
 
                 </configuration>
diff --git a/featurespecs/8.1AutomaticTranslationMigration.md b/featurespecs/8.1AutomaticTranslationMigration.md
new file mode 100644
index 000000000..cac51930e
--- /dev/null
+++ b/featurespecs/8.1AutomaticTranslationMigration.md
@@ -0,0 +1,91 @@
+# Discussion of Migration for Automatic Translation
+
+## Table of contents
+
+- [Background](#background)
+
+## Background
+
+The application integrates as an additional rollout configuration for Adobe Experience Manager (AEM) live copies,
+enabling seamless automated translation of content during the rollout process.
+
+Technically, the application enhances the AEM Multi-Site Manager (MSM) by adding an automatic translation layer for each
+live copy created from the source content. When a page is rolled out, the content is automatically translated, allowing
+editors to work directly with localized versions. To facilitate manual modifications, editors can break the inheritance
+at the component level. Once inheritance is broken, the edited content becomes independent of further rollouts until the
+inheritance is re-enabled. This ensures that manual improvements made to the translated content are preserved during
+future rollouts.
+
+The application supports both new and existing sites. For new sites, creating autotranslated live copies from scratch is
+straightforward. For existing sites with already developed language copies, the application facilitates migration by
+converting these language copies into live copies. This approach allows the integration of automated translation
+capabilities into pre-existing structures, while maintaining manual edits by breaking inheritance for previously
+modified components. This migration strategy ensures consistency between the source and target content while supporting
+efficient localization workflows.
+
+## General discussion
+
+It's possible to turn a language copy of a site into a live copy by using a groovy script to add
+cq:LiveSyncConfig nodes to the language copy and cq:LiveRelationship mixins to the source pages. This way, new pages
+can be rolled out an automatically translated to the target language. This document discusses how to deal with
+previously translated pages that exist independently in the source language and target language.
+
+## Ideas for dealing with existing pages
+
+1. Do nothing. Thus, there is a page in the source language site and a page in the target language site. The pages are
+   not connected in any way.
+    - Is it possible to connect them?
+2. Change existing pages to live copies without breaking inheritance.
+    - Overwrites the page completely on rollout.
+3. Change existing pages to live copies and break inheritance.
+    - Suspend whole page. That means the editor has to break inheritance manually on every component where he wants
+      to keep the texts.
+    - Break inheritance on all components.
+
+## Things to investigate
+
+1. What can I do on the UI if there is a source page and target page that are unrelated yet?
+2. Meaning of mixins and where are they normally added?
+3. Why wasn't the page translated in the current setting (only page itself has a lice copy mixin) -> FIXED
+4. How can we go from an unrelated state to all inheritances broken state?
+
+## Investigation log
+
+- /content/gfps/cn/zh-cn/products-solutions/innovation/connectivity : mixin removed
+    - No "Blueprint" tab as long as page is unrelated
+    - Rollout from original page possible. 9:44 -> OK, new translation
+- /content/gfps/cn/zh-cn/products-solutions/innovation/cool-fit suspend whole page
+    - adds mixin cq:LiveSyncCancelled . -> Rollout does not change anything.
+    - Resume live copy including sync -> ??? why does that stay english?????
+    - After second synchronization the page is newly translated into chinese.
+- /content/gfps/cn/zh-cn/products-solutions/innovation/pvc-u
+    1. synchronize from page properties : "duringLivecopyCreation"= true in AutoTranslateLiveActionImpl wegen
+       livecopyRelationship.getStatus().getLastRolledOut() == null . Problem: autosave = false, aber delayed
+       execution!!!
+       -> Fix: set that to true for delayed execution!
+    2. synchronize again
+
+- Not tested yet: what does
+  [LiveRelationshipManager](https://developer.adobe.com/experience-manager/reference-materials/6-5/javadoc/com/day/cq/wcm/msm/api/LiveRelationshipManager.html)
+  establishRelationship do?
+
+More experiments needed:
+
+- attaching with new components or deleted components
+
+## Variants to deal with pre-translated pages
+
+1. Do not change anything about them (no cq:LiveRelationship mixin) -> they look like a normal page.
+    - only way forward: manually edit them or roll out -> that'll wipe the page completely
+2. Set the page to cq:LiveSyncCancelled
+    - At least it shows inheritance cancelled on page and in report
+    - only way forward: reenable inheritance and roll out -> will wipe page completely
+3. Add cq:LiveRelationship and cq:LiveSyncCancelled to all components of page. E.g.
+   http://localhost:5502/editor.html/content/gfps/cn/zh-cn/products-solutions/innovation/stress-less.html
+    - needs reenabling inheritance on all components to get translations. BUT: translations have been checked /
+      written by hand.
+    - Perhaps workflow to reenable all and set all as properly translated?
+
+## Entirely other ideas
+
+Perhaps we can create some kind of merge tool for that stuff where the inheritance was broken?
diff --git a/featurespecs/AEMIntegrationIdeas.md b/featurespecs/AEMIntegrationIdeas.md
index ab5bddcf4..c2796d27e 100644
--- a/featurespecs/AEMIntegrationIdeas.md
+++ b/featurespecs/AEMIntegrationIdeas.md
@@ -166,7 +166,6 @@ http://localhost:4502/bin/browser.html/libs/core/wcm/components/text/v2/text
 Test on wcm editors, too!
 
 http://experience-aem.blogspot.com/2016/07/aem-62-touch-ui-rich-text-editor-inplace-editing-open-in-fullscreen-editing-start-event.html
-editing-start is triggered but I have trouble to catch it. TODO FIXME CONTINUE THIS
 
 ### icon
 
diff --git a/pom.xml b/pom.xml
index 099a3f8bc..5a3dace8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -135,4 +136,21 @@
         </developer>
     </developers>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.tngtech.archunit</groupId>
+                <artifactId>archunit</artifactId>
+                <version>1.3.0</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.tngtech.archunit</groupId>
+                <artifactId>archunit-junit4</artifactId>
+                <version>1.3.0</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>