diff --git a/DESCRIPTION b/DESCRIPTION
index afdab1dd7a..13ef344a0d 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -92,6 +92,7 @@ Roxygen: list(markdown = TRUE)
 RoxygenNote: 7.3.2
 Collate:
     'TealAppDriver.R'
+    'brush_filter.R'
     'checkmate.R'
     'dummy_functions.R'
     'get_rcode_utils.R'
diff --git a/NAMESPACE b/NAMESPACE
index e4c3a538d9..99d0bdcf0d 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -29,12 +29,14 @@ export(report_card_template)
 export(reporter_previewer_module)
 export(set_datanames)
 export(show_rcode_modal)
+export(srv_brush_filter)
 export(srv_teal)
 export(srv_teal_with_splash)
 export(tdata2env)
 export(teal_data_module)
 export(teal_slices)
 export(teal_transform_module)
+export(ui_brush_filter)
 export(ui_teal)
 export(ui_teal_with_splash)
 export(validate_has_data)
diff --git a/R/brush_filter.R b/R/brush_filter.R
new file mode 100644
index 0000000000..4cb411539c
--- /dev/null
+++ b/R/brush_filter.R
@@ -0,0 +1,97 @@
+# todo: this can't be in teal - it should be in teal.widgets, but... teal.widgets doesn't depend
+#       on teal.slice nor teal.transform. It is a mess and there is no easy solution to this now.
+#' @export
+ui_brush_filter <- function(id) {
+  ns <- NS(id)
+  div(
+    tags$h1(id = ns("title"), tags$strong("Selected points:"), class = "text-center font-150p"),
+    teal.widgets::get_dt_rows(ns("data_table"), ns("data_table_rows")),
+    actionButton(ns("apply_brush_filter"), "Apply filter"),
+    DT::dataTableOutput(ns("data_table"), width = "100%")
+  )
+}
+
+#' @export
+srv_brush_filter <- function(id, brush, dataset, filter_panel_api, selectors = list(), table_dec = 4) {
+  moduleServer(id, function(input, output, session) {
+    # selector_list <- isolate(selectors())
+
+    observeEvent(brush(), ignoreNULL = FALSE, {
+      if (is.null(brush())) {
+        shinyjs::hide("title")
+        shinyjs::hide("data_table")
+      } else {
+        shinyjs::show("title")
+        shinyjs::show("data_table")
+      }
+    })
+
+    brushed_table <- reactive({
+      req(brush())
+      if (is.null(brush())) {
+        return(NULL)
+      }
+      teal.widgets::clean_brushedPoints(isolate(dataset()), brush())
+    })
+
+    output$data_table <- DT::renderDataTable(server = TRUE, {
+      brushed_df <- req(brushed_table())
+      if (is.null(brushed_df)) {
+        return(NULL)
+      }
+      numeric_cols <- names(brushed_df)[
+        vapply(brushed_df, function(x) is.numeric(x) && !is.integer(x), FUN.VALUE = logical(1))
+      ]
+      if (length(numeric_cols) > 0) {
+        DT::formatRound(
+          DT::datatable(brushed_df,
+            rownames = FALSE,
+            options = list(scrollX = TRUE, pageLength = input$data_table_rows)
+          ),
+          numeric_cols,
+          table_dec
+        )
+      } else {
+        DT::datatable(brushed_df, rownames = FALSE, options = list(scrollX = TRUE, pageLength = input$data_table_rows))
+      }
+    })
+
+    observeEvent(input$data_table_rows_selected, ignoreNULL = FALSE, {
+      if (is.null(input$data_table_rows_selected)) {
+        shinyjs::hide("apply_brush_filter")
+      } else {
+        shinyjs::show("apply_brush_filter")
+      }
+    })
+
+    observeEvent(input$apply_brush_filter, {
+      if (is.null(input$data_table_rows_selected)) {
+        return(NULL)
+      }
+      # isolate({
+      #   foo1(brush, selector_list)
+      # })
+      brushed_df <- brushed_table()[input$data_table_rows_selected, ]
+      # todo: when added another time then it is duplicated
+      slice <- teal_slices(teal_slice(
+        dataname = "ADSL",
+        varname = "USUBJID",
+        selected = unique(brushed_df$USUBJID), # todo: this needs to be parametrised or based on join_keys
+        id = "brush_filter"
+      ))
+      shinyjs::hide("apply_brush_filter")
+      set_filter_state(filter_panel_api, slice)
+    })
+  })
+}
+
+#' get axis dataname, varname and ranges
+foo1 <- function(brush, selector_list) {
+  lapply(names(brush()$mapping), function(selector) {
+    list(
+      dataname = selector_list[[selector]]()$dataname,
+      varname = brush()$mapping[[selector]],
+      values = unlist(brush()[paste0(selector, c("min", "max"))])
+    )
+  })
+}
diff --git a/man/foo1.Rd b/man/foo1.Rd
new file mode 100644
index 0000000000..ab5dfc4a80
--- /dev/null
+++ b/man/foo1.Rd
@@ -0,0 +1,11 @@
+% Generated by roxygen2: do not edit by hand
+% Please edit documentation in R/brush_filter.R
+\name{foo1}
+\alias{foo1}
+\title{get axis dataname, varname and ranges}
+\usage{
+foo1(brush, selector_list)
+}
+\description{
+get axis dataname, varname and ranges
+}
diff --git a/man/teal_data_module.Rd b/man/teal_data_module.Rd
index 9c3cbd29f9..9765ce4504 100644
--- a/man/teal_data_module.Rd
+++ b/man/teal_data_module.Rd
@@ -35,7 +35,9 @@ App user will be able to interact and change the data output from the module mul
 
 \item{object}{(\code{teal_data_module})}
 
-\item{code}{(\code{character} or \code{language}) code to evaluate. If \code{character}, comments are retained.}
+\item{code}{(\code{character}, \code{language} or \code{expression}) code to evaluate.
+It is possible to preserve original formatting of the \code{code} by providing a \code{character} or an
+\code{expression} being a result of \code{parse(keep.source = TRUE)}.}
 
 \item{data}{(\code{teal_data_module}) object}