diff --git a/deploy/dump.cmd b/deploy/dump.cmd
index aab7d1e..5492d7f 100644
--- a/deploy/dump.cmd
+++ b/deploy/dump.cmd
@@ -1,4 +1,4 @@
-"C:\PostgreSQL\pg10\bin\pg_dump" -h localhost -p 5433 -U ptrowbridge -d ubm -s -n "tps" -O -F p -f "C:\users\fleet\Documents\tps_etl\deploy\ubm_schema.sql"
+"C:\PostgreSQL\pg10\bin\pg_dump" -h localhost -p 5433 -U ptrowbridge -d ubm2 -s -n "tps" -O -F p -f "C:\users\fleet\Documents\tps_etl\deploy\ubm_schema.sql"
 
 "/home/ubuntu/workspace/bigsql/pg10/bin/psql" -h localhost -p 5433 -U ptrowbridge -d ubm -s -n "tps" -O -F p -f "/home/ubuntu/workspace/tps_etl/deploy/ubm_schema.sql"
 
diff --git a/deploy/ubm_schema.sql b/deploy/ubm_schema.sql
index 7a51994..cf3ccb9 100644
--- a/deploy/ubm_schema.sql
+++ b/deploy/ubm_schema.sql
@@ -419,6 +419,320 @@ END;
 $_$;
 
 
+--
+-- Name: srce_map_overwrite(text); Type: FUNCTION; Schema: tps; Owner: -
+--
+
+CREATE FUNCTION srce_map_overwrite(_srce text) RETURNS jsonb
+    LANGUAGE plpgsql
+    AS $_$
+DECLARE
+    _message jsonb;
+    _MESSAGE_TEXT text;
+    _PG_EXCEPTION_DETAIL text;
+    _PG_EXCEPTION_HINT text;
+
+BEGIN
+    WITH
+    --------------------apply regex operations to transactions-----------------------------------------------------------------------------------
+
+    rx AS (
+    SELECT 
+        t.srce,
+        t.id,
+        t.rec,
+        m.target,
+        m.seq,
+        regex->>'function' regex_function,
+        e.v ->> 'field' result_key_name,
+        e.v ->> 'key' target_json_path,
+        e.v ->> 'flag' regex_options_flag,
+        e.v->>'map' map_intention,
+        e.v->>'retain' retain_result,
+        e.v->>'regex' regex_expression,
+        e.rn target_item_number,
+        COALESCE(mt.rn,rp.rn,1) result_number,
+        mt.mt rx_match,
+        rp.rp rx_replace,
+        CASE e.v->>'map'
+            WHEN 'y' THEN
+                e.v->>'field'
+            ELSE
+                null
+        END map_key,
+        CASE e.v->>'map'
+            WHEN 'y' THEN
+                CASE regex->>'function'
+                    WHEN 'extract' THEN
+                        CASE WHEN array_upper(mt.mt,1)=1 
+                            THEN to_json(mt.mt[1])
+                            ELSE array_to_json(mt.mt)
+                        END::jsonb
+                    WHEN 'replace' THEN
+                        to_jsonb(rp.rp)
+                    ELSE
+                        '{}'::jsonb
+                END
+            ELSE
+                NULL
+        END map_val,
+        CASE e.v->>'retain'
+            WHEN 'y' THEN
+                e.v->>'field'
+            ELSE
+                NULL
+        END retain_key,
+        CASE e.v->>'retain'
+            WHEN 'y' THEN
+                CASE regex->>'function'
+                    WHEN 'extract' THEN
+                        CASE WHEN array_upper(mt.mt,1)=1 
+                            THEN to_json(trim(mt.mt[1]))
+                            ELSE array_to_json(mt.mt)
+                        END::jsonb
+                    WHEN 'replace' THEN
+                        to_jsonb(rtrim(rp.rp))
+                    ELSE
+                        '{}'::jsonb
+                END
+            ELSE
+                NULL
+        END retain_val
+    FROM 
+        tps.map_rm m
+        LEFT JOIN LATERAL jsonb_array_elements(m.regex->'where') w(v) ON TRUE
+        INNER JOIN tps.trans t ON 
+            t.srce = m.srce AND
+            t.rec @> w.v
+        LEFT JOIN LATERAL jsonb_array_elements(m.regex->'defn') WITH ORDINALITY e(v, rn) ON true
+        LEFT JOIN LATERAL regexp_matches(t.rec #>> ((e.v ->> 'key')::text[]), e.v ->> 'regex'::text,COALESCE(e.v ->> 'flag','')) WITH ORDINALITY mt(mt, rn) ON
+            m.regex->>'function' = 'extract'
+        LEFT JOIN LATERAL regexp_replace(t.rec #>> ((e.v ->> 'key')::text[]), e.v ->> 'regex'::text, e.v ->> 'replace'::text,e.v ->> 'flag') WITH ORDINALITY rp(rp, rn) ON
+            m.regex->>'function' = 'replace'
+    WHERE
+        --t.allj IS NULL
+        t.srce = _srce
+        --rec @> '{"Transaction":"ACH Credits","Transaction":"ACH Debits"}'
+        --rec @> '{"Description":"CHECK 93013270 086129935"}'::jsonb
+    ORDER BY 
+        t.id DESC,
+        m.target,
+        e.rn,
+        COALESCE(mt.rn,rp.rn,1)
+    )
+
+    --SELECT count(*) FROM rx LIMIT 100
+
+
+    , agg_to_target_items AS (
+    SELECT 
+        srce
+        ,id
+        ,target
+        ,seq
+        ,map_intention
+        ,regex_function
+        ,target_item_number
+        ,result_key_name
+        ,target_json_path
+        ,CASE WHEN map_key IS NULL 
+            THEN    
+                NULL 
+            ELSE 
+                jsonb_build_object(
+                    map_key,
+                    CASE WHEN max(result_number) = 1
+                        THEN
+                            jsonb_agg(map_val ORDER BY result_number) -> 0
+                        ELSE
+                            jsonb_agg(map_val ORDER BY result_number)
+                    END
+                ) 
+        END map_val
+        ,CASE WHEN retain_key IS NULL 
+            THEN 
+                NULL 
+            ELSE 
+                jsonb_build_object(
+                    retain_key,
+                    CASE WHEN max(result_number) = 1
+                        THEN
+                            jsonb_agg(retain_val ORDER BY result_number) -> 0
+                        ELSE
+                            jsonb_agg(retain_val ORDER BY result_number)
+                    END
+                ) 
+        END retain_val
+    FROM 
+        rx
+    GROUP BY
+        srce
+        ,id
+        ,target
+        ,seq
+        ,map_intention
+        ,regex_function
+        ,target_item_number
+        ,result_key_name
+        ,target_json_path
+        ,map_key
+        ,retain_key
+    )
+
+    --SELECT * FROM agg_to_target_items LIMIT 100
+
+
+    , agg_to_target AS (
+    SELECT
+        srce
+        ,id
+        ,target
+        ,seq
+        ,map_intention
+        ,tps.jsonb_concat_obj(COALESCE(map_val,'{}'::JSONB)) map_val
+        ,jsonb_strip_nulls(tps.jsonb_concat_obj(COALESCE(retain_val,'{}'::JSONB))) retain_val
+    FROM
+        agg_to_target_items
+    GROUP BY
+        srce
+        ,id
+        ,target
+        ,seq
+        ,map_intention
+    ORDER BY
+        id
+    )
+
+
+    --SELECT * FROM agg_to_target
+
+
+    , link_map AS (
+    SELECT
+        a.srce
+        ,a.id
+        ,a.target
+        ,a.seq
+        ,a.map_intention
+        ,a.map_val
+        ,a.retain_val retain_value
+        ,v.map
+    FROM
+        agg_to_target a
+        LEFT OUTER JOIN tps.map_rv v ON
+            v.srce = a.srce AND
+            v.target = a.target AND
+            v.retval = a.map_val
+    )
+
+    --SELECT * FROM link_map
+
+    , agg_to_id AS (
+    SELECT
+        srce
+        ,id
+        ,tps.jsonb_concat_obj(COALESCE(retain_value,'{}'::jsonb) ORDER BY seq DESC) retain_val
+        ,tps.jsonb_concat_obj(COALESCE(map,'{}'::jsonb)) map
+    FROM
+        link_map
+    GROUP BY
+        srce
+        ,id
+    )
+
+    --SELECT agg_to_id.srce, agg_to_id.id, jsonb_pretty(agg_to_id.retain_val) , jsonb_pretty(agg_to_id.map) FROM agg_to_id ORDER BY id desc LIMIT 100
+
+
+
+    UPDATE
+        tps.trans t
+    SET
+        map = o.map,
+        parse = o.retain_val,
+        allj = t.rec||o.map||o.retain_val
+    FROM
+        agg_to_id o
+    WHERE
+        o.id = t.id;
+
+    _message:= jsonb_build_object('status','complete');
+    RETURN _message;
+
+EXCEPTION WHEN OTHERS THEN
+
+    GET STACKED DIAGNOSTICS 
+            _MESSAGE_TEXT = MESSAGE_TEXT,
+            _PG_EXCEPTION_DETAIL = PG_EXCEPTION_DETAIL,
+            _PG_EXCEPTION_HINT = PG_EXCEPTION_HINT;
+    _message:= 
+        ($$
+            {
+                "status":"fail",
+                "message":"error setting map value"
+            }
+        $$::jsonb)
+        ||jsonb_build_object('message_text',_MESSAGE_TEXT)
+        ||jsonb_build_object('pg_exception_detail',_PG_EXCEPTION_DETAIL);
+
+    RETURN _message;
+END;
+$_$;
+
+
+--
+-- Name: srce_map_val_set(text, text, jsonb, jsonb); Type: FUNCTION; Schema: tps; Owner: -
+--
+
+CREATE FUNCTION srce_map_val_set(_srce text, _target text, _ret jsonb, _map jsonb) RETURNS jsonb
+    LANGUAGE plpgsql
+    AS $_$
+
+DECLARE
+    _message jsonb;
+    _MESSAGE_TEXT text;
+    _PG_EXCEPTION_DETAIL text;
+    _PG_EXCEPTION_HINT text;
+
+BEGIN
+
+    INSERT INTO
+        tps.map_rv
+    SELECT
+        _srce
+        ,_target
+        ,_ret
+        ,_map
+    ON CONFLICT ON CONSTRAINT map_rv_pk DO UPDATE SET
+        srce = _srce
+        ,target = _target
+        ,retval = _ret
+        ,map = _map;
+
+    _message:= jsonb_build_object('status','complete');
+    RETURN _message;
+
+EXCEPTION WHEN OTHERS THEN
+
+    GET STACKED DIAGNOSTICS 
+            _MESSAGE_TEXT = MESSAGE_TEXT,
+            _PG_EXCEPTION_DETAIL = PG_EXCEPTION_DETAIL,
+            _PG_EXCEPTION_HINT = PG_EXCEPTION_HINT;
+    _message:= 
+        ($$
+            {
+                "status":"fail",
+                "message":"error setting map value"
+            }
+        $$::jsonb)
+        ||jsonb_build_object('message_text',_MESSAGE_TEXT)
+        ||jsonb_build_object('pg_exception_detail',_PG_EXCEPTION_DETAIL);
+
+        RETURN _message;
+
+END
+$_$;
+
+
 --
 -- Name: srce_set(text, jsonb); Type: FUNCTION; Schema: tps; Owner: -
 --
diff --git a/functions/srce_map_set.sql b/functions/srce_map_def_set.sql
similarity index 100%
rename from functions/srce_map_set.sql
rename to functions/srce_map_def_set.sql
diff --git a/functions/srce_map_overwrite.sql b/functions/srce_map_overwrite.sql
new file mode 100644
index 0000000..f11841f
--- /dev/null
+++ b/functions/srce_map_overwrite.sql
@@ -0,0 +1,255 @@
+CREATE OR REPLACE FUNCTION tps.srce_map_overwrite(_srce text) RETURNS jsonb
+AS
+$f$
+DECLARE
+    _message jsonb;
+    _MESSAGE_TEXT text;
+    _PG_EXCEPTION_DETAIL text;
+    _PG_EXCEPTION_HINT text;
+
+BEGIN
+    WITH
+    --------------------apply regex operations to transactions-----------------------------------------------------------------------------------
+
+    rx AS (
+    SELECT 
+        t.srce,
+        t.id,
+        t.rec,
+        m.target,
+        m.seq,
+        regex->>'function' regex_function,
+        e.v ->> 'field' result_key_name,
+        e.v ->> 'key' target_json_path,
+        e.v ->> 'flag' regex_options_flag,
+        e.v->>'map' map_intention,
+        e.v->>'retain' retain_result,
+        e.v->>'regex' regex_expression,
+        e.rn target_item_number,
+        COALESCE(mt.rn,rp.rn,1) result_number,
+        mt.mt rx_match,
+        rp.rp rx_replace,
+        CASE e.v->>'map'
+            WHEN 'y' THEN
+                e.v->>'field'
+            ELSE
+                null
+        END map_key,
+        CASE e.v->>'map'
+            WHEN 'y' THEN
+                CASE regex->>'function'
+                    WHEN 'extract' THEN
+                        CASE WHEN array_upper(mt.mt,1)=1 
+                            THEN to_json(mt.mt[1])
+                            ELSE array_to_json(mt.mt)
+                        END::jsonb
+                    WHEN 'replace' THEN
+                        to_jsonb(rp.rp)
+                    ELSE
+                        '{}'::jsonb
+                END
+            ELSE
+                NULL
+        END map_val,
+        CASE e.v->>'retain'
+            WHEN 'y' THEN
+                e.v->>'field'
+            ELSE
+                NULL
+        END retain_key,
+        CASE e.v->>'retain'
+            WHEN 'y' THEN
+                CASE regex->>'function'
+                    WHEN 'extract' THEN
+                        CASE WHEN array_upper(mt.mt,1)=1 
+                            THEN to_json(trim(mt.mt[1]))
+                            ELSE array_to_json(mt.mt)
+                        END::jsonb
+                    WHEN 'replace' THEN
+                        to_jsonb(rtrim(rp.rp))
+                    ELSE
+                        '{}'::jsonb
+                END
+            ELSE
+                NULL
+        END retain_val
+    FROM 
+        tps.map_rm m
+        LEFT JOIN LATERAL jsonb_array_elements(m.regex->'where') w(v) ON TRUE
+        INNER JOIN tps.trans t ON 
+            t.srce = m.srce AND
+            t.rec @> w.v
+        LEFT JOIN LATERAL jsonb_array_elements(m.regex->'defn') WITH ORDINALITY e(v, rn) ON true
+        LEFT JOIN LATERAL regexp_matches(t.rec #>> ((e.v ->> 'key')::text[]), e.v ->> 'regex'::text,COALESCE(e.v ->> 'flag','')) WITH ORDINALITY mt(mt, rn) ON
+            m.regex->>'function' = 'extract'
+        LEFT JOIN LATERAL regexp_replace(t.rec #>> ((e.v ->> 'key')::text[]), e.v ->> 'regex'::text, e.v ->> 'replace'::text,e.v ->> 'flag') WITH ORDINALITY rp(rp, rn) ON
+            m.regex->>'function' = 'replace'
+    WHERE
+        --t.allj IS NULL
+        t.srce = _srce
+        --rec @> '{"Transaction":"ACH Credits","Transaction":"ACH Debits"}'
+        --rec @> '{"Description":"CHECK 93013270 086129935"}'::jsonb
+    ORDER BY 
+        t.id DESC,
+        m.target,
+        e.rn,
+        COALESCE(mt.rn,rp.rn,1)
+    )
+
+    --SELECT count(*) FROM rx LIMIT 100
+
+
+    , agg_to_target_items AS (
+    SELECT 
+        srce
+        ,id
+        ,target
+        ,seq
+        ,map_intention
+        ,regex_function
+        ,target_item_number
+        ,result_key_name
+        ,target_json_path
+        ,CASE WHEN map_key IS NULL 
+            THEN    
+                NULL 
+            ELSE 
+                jsonb_build_object(
+                    map_key,
+                    CASE WHEN max(result_number) = 1
+                        THEN
+                            jsonb_agg(map_val ORDER BY result_number) -> 0
+                        ELSE
+                            jsonb_agg(map_val ORDER BY result_number)
+                    END
+                ) 
+        END map_val
+        ,CASE WHEN retain_key IS NULL 
+            THEN 
+                NULL 
+            ELSE 
+                jsonb_build_object(
+                    retain_key,
+                    CASE WHEN max(result_number) = 1
+                        THEN
+                            jsonb_agg(retain_val ORDER BY result_number) -> 0
+                        ELSE
+                            jsonb_agg(retain_val ORDER BY result_number)
+                    END
+                ) 
+        END retain_val
+    FROM 
+        rx
+    GROUP BY
+        srce
+        ,id
+        ,target
+        ,seq
+        ,map_intention
+        ,regex_function
+        ,target_item_number
+        ,result_key_name
+        ,target_json_path
+        ,map_key
+        ,retain_key
+    )
+
+    --SELECT * FROM agg_to_target_items LIMIT 100
+
+
+    , agg_to_target AS (
+    SELECT
+        srce
+        ,id
+        ,target
+        ,seq
+        ,map_intention
+        ,tps.jsonb_concat_obj(COALESCE(map_val,'{}'::JSONB)) map_val
+        ,jsonb_strip_nulls(tps.jsonb_concat_obj(COALESCE(retain_val,'{}'::JSONB))) retain_val
+    FROM
+        agg_to_target_items
+    GROUP BY
+        srce
+        ,id
+        ,target
+        ,seq
+        ,map_intention
+    ORDER BY
+        id
+    )
+
+
+    --SELECT * FROM agg_to_target
+
+
+    , link_map AS (
+    SELECT
+        a.srce
+        ,a.id
+        ,a.target
+        ,a.seq
+        ,a.map_intention
+        ,a.map_val
+        ,a.retain_val retain_value
+        ,v.map
+    FROM
+        agg_to_target a
+        LEFT OUTER JOIN tps.map_rv v ON
+            v.srce = a.srce AND
+            v.target = a.target AND
+            v.retval = a.map_val
+    )
+
+    --SELECT * FROM link_map
+
+    , agg_to_id AS (
+    SELECT
+        srce
+        ,id
+        ,tps.jsonb_concat_obj(COALESCE(retain_value,'{}'::jsonb) ORDER BY seq DESC) retain_val
+        ,tps.jsonb_concat_obj(COALESCE(map,'{}'::jsonb)) map
+    FROM
+        link_map
+    GROUP BY
+        srce
+        ,id
+    )
+
+    --SELECT agg_to_id.srce, agg_to_id.id, jsonb_pretty(agg_to_id.retain_val) , jsonb_pretty(agg_to_id.map) FROM agg_to_id ORDER BY id desc LIMIT 100
+
+
+
+    UPDATE
+        tps.trans t
+    SET
+        map = o.map,
+        parse = o.retain_val,
+        allj = t.rec||o.map||o.retain_val
+    FROM
+        agg_to_id o
+    WHERE
+        o.id = t.id;
+
+    _message:= jsonb_build_object('status','complete');
+    RETURN _message;
+
+EXCEPTION WHEN OTHERS THEN
+
+    GET STACKED DIAGNOSTICS 
+            _MESSAGE_TEXT = MESSAGE_TEXT,
+            _PG_EXCEPTION_DETAIL = PG_EXCEPTION_DETAIL,
+            _PG_EXCEPTION_HINT = PG_EXCEPTION_HINT;
+    _message:= 
+        ($$
+            {
+                "status":"fail",
+                "message":"error setting map value"
+            }
+        $$::jsonb)
+        ||jsonb_build_object('message_text',_MESSAGE_TEXT)
+        ||jsonb_build_object('pg_exception_detail',_PG_EXCEPTION_DETAIL);
+
+    RETURN _message;
+END;
+$f$
+language plpgsql
\ No newline at end of file
diff --git a/functions/srce_map_val_set.sql b/functions/srce_map_val_set.sql
new file mode 100644
index 0000000..83be455
--- /dev/null
+++ b/functions/srce_map_val_set.sql
@@ -0,0 +1,49 @@
+CREATE OR REPLACE FUNCTION tps.srce_map_val_set(_srce text, _target text, _ret jsonb, _map jsonb) RETURNS jsonb
+AS
+$f$
+
+DECLARE
+    _message jsonb;
+    _MESSAGE_TEXT text;
+    _PG_EXCEPTION_DETAIL text;
+    _PG_EXCEPTION_HINT text;
+
+BEGIN
+
+    INSERT INTO
+        tps.map_rv
+    SELECT
+        _srce
+        ,_target
+        ,_ret
+        ,_map
+    ON CONFLICT ON CONSTRAINT map_rv_pk DO UPDATE SET
+        srce = _srce
+        ,target = _target
+        ,retval = _ret
+        ,map = _map;
+
+    _message:= jsonb_build_object('status','complete');
+    RETURN _message;
+
+EXCEPTION WHEN OTHERS THEN
+
+    GET STACKED DIAGNOSTICS 
+            _MESSAGE_TEXT = MESSAGE_TEXT,
+            _PG_EXCEPTION_DETAIL = PG_EXCEPTION_DETAIL,
+            _PG_EXCEPTION_HINT = PG_EXCEPTION_HINT;
+    _message:= 
+        ($$
+            {
+                "status":"fail",
+                "message":"error setting map value"
+            }
+        $$::jsonb)
+        ||jsonb_build_object('message_text',_MESSAGE_TEXT)
+        ||jsonb_build_object('pg_exception_detail',_PG_EXCEPTION_DETAIL);
+
+        RETURN _message;
+
+END
+$f$
+language plpgsql
\ No newline at end of file
diff --git a/reports/all_map_return_values.sql b/reports/all_map_return_values.sql
index 1f802b3..b8b50c7 100644
--- a/reports/all_map_return_values.sql
+++ b/reports/all_map_return_values.sql
@@ -240,6 +240,6 @@ ORDER BY
     l.srce
     ,l.target
     ,l.seq
-    ,l."count"
+    ,l."count" desc
     ,l.map_val
     ,l.mapped_val
\ No newline at end of file
diff --git a/sample_discovercard/mapping.md b/sample_discovercard/mapping.md
index 5fe8f94..4d7fb8b 100644
--- a/sample_discovercard/mapping.md
+++ b/sample_discovercard/mapping.md
@@ -79,10 +79,10 @@ map definition
 
 SQL
 ---------------------------------------------
-select 
+SELECT
 	x.x
-from
-	TPS.srce_map_def_set(
+FROM
+	tps.srce_map_def_set(
     'DCARD'::text,
     'First 20'::text,
     $$    {
@@ -90,7 +90,7 @@ from
             {
                 "key": "{Description}",
                 "map": "y",
-                "flag": "g",
+                "flag": "",
                 "field": "f20",
                 "regex": ".{1,20}",
                 "retain": "y"
@@ -120,4 +120,25 @@ assign new key/values to the results of the regular expression, and then back to
 | {"f20": "7-ELEVEN 36241 STOW "} | 7-Eleven          | Gasoline      | Stow   | Ohio    |     |
 | {"f20": "98626 - 200 PUBLIC S"} | Public Sq Parking | Recreation    |        |         |     |
 | {"f20": "ACE HARDWARE HUDSON "} | Ace Hardware      | Home Maint    | Hudson | Ohio    |     |
-| {"f20": "ACH CAFE AND STARBUC"} | Starbucks         | Restaurantes  |        |         |     |
\ No newline at end of file
+| {"f20": "ACH CAFE AND STARBUC"} | Starbucks         | Restaurantes  |        |         |     |
+
+
+function call to setup a a new map value
+---------------------------------------------
+SELECT
+    x.message
+FROM
+    tps.srce_map_val_set(
+        'DCARD'
+        ,'First 20'
+        ,'{"f20": "DISCOUNT DRUG MART 3"}'::JSONB
+        ,'{"party":"Discount Drug Mart","reason":"groceries"}'::JSONB
+    ) x(message);
+
+function call to re-run all the maps for a source
+----------------------------------------------------
+
+SELECT
+    x.message
+FROM
+    tps.srce_map_overwrite('DCARD') x(message);
\ No newline at end of file