143 changed files with 1006 additions and 4255 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1,16 +0,0 @@
-/**
-!/args
-!/cmd/africastalking
-!/cmd/ssh
-!/config
-!/debug
-!/handlers
-!/internal
-!/profile
-!/services
-!/ssh
-!/store
-!/LICENSE
-!/README.md
-!/go.*
-!/.env.example
--- a/.env.example
+++ b/.env.example
@ -18,14 +18,3 @@ DATA_URL_BASE=http://localhost:5006
 #Language
 DEFAULT_LANGUAGE=eng
 LANGUAGES=eng, swa
-
-#Alias search domains
-ALIAS_SEARCH_DOMAINS=sarafu.local, sarafu.eth
-
-#Pool swap
-DEFAULT_POOL_NAME="Kenya ROLA Pool"
-DEFAULT_POOL_SYMBOL=ROLA
-DEFAULT_POOL_CONTRACT_ADDRESS=0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e
-DEFAULT_LIMITER_ADDRESS=
-DEFAULT_VOUCHER_REGISTRY=
-INCLUDE_STABLES_PARAM=false
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@ -1,56 +0,0 @@
-name: release
-
-on:
-  push:
-    tags:
-      - "v*"
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Check out repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Cache Docker layers
-        uses: actions/cache@v3
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-
-      - name: Login to GHCR Docker registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set outputs
-        run: |
-          echo "RELEASE_TAG=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV \
-          && echo "RELEASE_SHORT_COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
-      - name: Build and push image
-        uses: docker/build-push-action@v2
-        with:
-          context: ./
-          file: ./Dockerfile
-          platforms: linux/amd64
-          push: true
-          build-args: |
-            BUILD=${{ env.RELEASE_SHORT_COMMIT }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache
-          tags: |
-            ghcr.io/grassrootseconomics/sarafu-vise:latest
-            ghcr.io/grassrootseconomics/sarafu-vise:${{ env.RELEASE_TAG }}
--- a/47
+++ b/47
@ -1,47 +0,0 @@
-FROM golang:1.23.4-bookworm AS build
-
-ENV CGO_ENABLED=1
-
-ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-ARG BUILD=dev
-
-WORKDIR /build
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    libgdbm-dev \
-    git \
-    && rm -rf /var/lib/apt/lists/*
-RUN git clone https://git.defalsify.org/vise.git go-vise
-COPY . ./sarafu-vise
-
-WORKDIR /build/sarafu-vise/services/registration
-RUN echo "Compiling go-vise files"
-RUN make VISE_PATH=/build/go-vise -B
-
-WORKDIR /build/sarafu-vise
-RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
-RUN go mod download
-RUN go build -tags logdebug,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
-
-FROM debian:bookworm-slim
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    libgdbm-dev \
-    ca-certificates \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-WORKDIR /service
-
-COPY --from=build /build/sarafu-vise/sarafu-at .
-COPY --from=build /build/sarafu-vise/LICENSE .
-COPY --from=build /build/sarafu-vise/README.md .
-COPY --from=build /build/sarafu-vise/services ./services
-COPY --from=build /build/sarafu-vise/.env.example .
-RUN mv .env.example .env
-
-EXPOSE 7123
-
-CMD ["./sarafu-at"]
--- a/args/lang.go
+++ b/args/lang.go
@ -10,7 +10,7 @@ type LangVar struct {
 	v []lang.Language
 }

-func (lv *LangVar) Set(s string) error {
+func(lv *LangVar) Set(s string) error {
 	v, err := lang.LanguageFromCode(s)
 	if err != nil {
 		return err
@ -19,14 +19,16 @@ func (lv *LangVar) Set(s string) error {
 	return err
 }

-func (lv *LangVar) String() string {
+func(lv *LangVar) String() string {
 	var s []string
-	for _, v := range lv.v {
+	for _, v := range(lv.v) {
 		s = append(s, v.Code)
 	}
 	return strings.Join(s, ",")
 }

-func (lv *LangVar) Langs() []lang.Language {
+func(lv *LangVar) Langs() []lang.Language {
 	return lv.v
 }
+
+
--- a/cmd/africastalking/main.go
+++ b/cmd/africastalking/main.go
@ -12,18 +12,18 @@ import (
 	"syscall"

 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/logging"
+	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/resource"

 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
-
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	
+	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/africastalking"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
-	at "git.grassecon.net/grassrootseconomics/visedriver-africastalking/africastalking"
 )

 var (
@ -44,19 +44,17 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
-	var logDbConnStr string

 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.Host(), "http host")
 	flag.UintVar(&port, "p", config.Port(), "http port")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
-	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()

 	config.Apply(override)
@ -83,7 +81,6 @@ func main() {
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
 		MenuSeparator: menuSeparator,
-		ResetOnEmptyInput: true,
 	}

 	if engineDebug {
@ -102,11 +99,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, "userdatadb: %v\n", err)
 		os.Exit(1)
 	}
-	logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
-		os.Exit(1)
-	}

 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
@ -120,14 +112,13 @@ func main() {
 		os.Exit(1)
 	}
 	lhs.SetDataStore(&userdataStore)
-	lhs.SetLogDb(&logdb)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "setdatastore: %v\n", err)
 		os.Exit(1)
 	}

 	accountService := services.New(ctx, menuStorageService)
-
+	
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "httpaccountservice: %v\n", err)
@ -142,7 +133,6 @@ func main() {

 	rp := &at.ATRequestParser{}
 	bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	bsh = bsh.WithEngineFunc(lhs.GetEngine)
 	sh := at.NewATRequestHandler(bsh)

 	mux := http.NewServeMux()
--- a/cmd/async/main.go
+++ b/cmd/async/main.go
@ -1,15 +1,12 @@
 package main

 import (
-	"bufio"
 	"context"
 	"flag"
 	"fmt"
-	"io"
 	"os"
 	"os/signal"
 	"path"
-	"strings"
 	"syscall"

 	"git.defalsify.org/vise.git/engine"
@ -17,12 +14,12 @@ import (
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"

-	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
-	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )

 var (
@ -56,13 +53,12 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
-	var logDbConnStr string

 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")

 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
@ -70,7 +66,6 @@ func main() {
 	flag.UintVar(&port, "p", config.Port(), "http port")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
-	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()

 	config.Apply(override)
@ -98,7 +93,6 @@ func main() {
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
 		MenuSeparator: menuSeparator,
-		ResetOnEmptyInput: true,
 	}

 	if engineDebug {
@ -122,12 +116,6 @@ func main() {
 		fmt.Fprintf(os.Stderr, err.Error())
 		os.Exit(1)
 	}
-
-	logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
-		os.Exit(1)
-	}
 	//defer userdataStore.Close(ctx)

 	dbResource, ok := rs.(*resource.DbResource)
@ -137,9 +125,9 @@ func main() {

 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
-	lhs.SetLogDb(&logdb)

 	accountService := services.New(ctx, menuStorageService)
+
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@ -157,8 +145,6 @@ func main() {
 		sessionId: sessionId,
 	}
 	sh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	sh = sh.WithEngineFunc(lhs.GetEngine)
-
 	cfg.SessionId = sessionId
 	rqs := request.RequestSession{
 		Ctx:    ctx,
@ -198,19 +184,11 @@ func main() {
 			os.Exit(1)
 		}
 		fmt.Println("")
-		in := bufio.NewReader(os.Stdin)
-		s, err := in.ReadString('\n')
+		_, err = fmt.Scanln(&rqs.Input)
 		if err != nil {
-			if err == io.EOF {
-				logg.DebugCtxf(ctx, "have EOF, bailing")
-				break
-			}
 			logg.ErrorCtxf(ctx, "error in input", "err", err)
 			fmt.Errorf("error in input: %v", err)
 			os.Exit(1)
 		}
-		rqs.Input = []byte{}
-		s = strings.TrimSpace(s)
-		rqs.Input = []byte(s)
 	}
 }
--- a/cmd/http/main.go
+++ b/cmd/http/main.go
@ -17,13 +17,13 @@ import (
 	"git.defalsify.org/vise.git/resource"

 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	httprequest "git.grassecon.net/grassrootseconomics/visedriver/request/http"
+	"git.grassecon.net/grassrootseconomics/visedriver/request"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"

+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 )

 var (
@ -43,12 +43,11 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
-	var logDbConnStr string

-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")

 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
@ -56,7 +55,6 @@ func main() {
 	flag.UintVar(&port, "p", config.Port(), "http port")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
-	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()

 	config.Apply(override)
@ -84,7 +82,6 @@ func main() {
 		OutputSize:    uint32(size),
 		FlagCount:     uint32(128),
 		MenuSeparator: menuSeparator,
-		ResetOnEmptyInput: true,
 	}

 	if engineDebug {
@ -105,12 +102,6 @@ func main() {
 		os.Exit(1)
 	}

-	logdb, err := menuStorageService.GetLogDb(ctx, userdataStore, logDbConnStr, "user-data")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
-		os.Exit(1)
-	}
-
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
 		os.Exit(1)
@ -118,7 +109,6 @@ func main() {

 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdataStore)
-	lhs.SetLogDb(&logdb)

 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@ -126,7 +116,7 @@ func main() {
 	}

 	accountService := services.New(ctx, menuStorageService)
-
+	
 	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, err.Error())
@ -143,7 +133,6 @@ func main() {

 	rp := &httprequest.DefaultRequestParser{}
 	bsh := request.NewBaseRequestHandler(cfg, rs, stateStore, userdataStore, rp, hl)
-	bsh = bsh.WithEngineFunc(lhs.GetEngine)
 	sh := httprequest.NewHTTPRequestHandler(bsh)
 	s := &http.Server{
 		Addr:    fmt.Sprintf("%s:%s", host, strconv.Itoa(int(port))),
--- a/cmd/main.go
+++ b/cmd/main.go
@ -10,14 +10,14 @@ import (
 	"syscall"

 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/resource"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
+	"git.defalsify.org/vise.git/lang"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/services"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/args"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers"
 )

 var (
@ -36,18 +36,16 @@ func main() {
 	var err error
 	var gettextDir string
 	var langs args.LangVar
-	var logDbConnStr string

 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&gettextDir, "gettext", "", "use gettext translations from given directory")
 	flag.Var(&langs, "language", "add symbol resolution for language")
-	flag.StringVar(&logDbConnStr, "log-c", "db-logs", "log db connection string")
 	flag.Parse()

 	config.Apply(override)
@ -64,6 +62,7 @@ func main() {
 	}

 	ctx := context.Background()
+	ctx = context.WithValue(ctx, "SessionId", sessionId)

 	ln, err := lang.LanguageFromCode(config.Language())
 	if err != nil {
@ -75,13 +74,11 @@ func main() {
 	pfp := path.Join(scriptDir, "pp.csv")

 	cfg := engine.Config{
-		Root:              "root",
-		SessionId:         sessionId,
-		OutputSize:        uint32(size),
-		FlagCount:         uint32(128),
-		MenuSeparator:     menuSeparator,
-		EngineDebug:       engineDebug,
-		ResetOnEmptyInput: true,
+		Root:          "root",
+		SessionId:     sessionId,
+		OutputSize:    uint32(size),
+		FlagCount:     uint32(128),
+		MenuSeparator: menuSeparator,
 	}

 	menuStorageService := storage.NewMenuStorageService(conns)
@ -89,7 +86,7 @@ func main() {
 		fmt.Fprintf(os.Stderr, "menu storage service error: %v\n", err)
 		os.Exit(1)
 	}
-
+	
 	if gettextDir != "" {
 		menuStorageService = menuStorageService.WithGettext(gettextDir, langs.Langs())
 	}
@ -112,12 +109,6 @@ func main() {
 		os.Exit(1)
 	}

-	logdb, err := menuStorageService.GetLogDb(ctx, userdatastore, logDbConnStr, "user-data")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "get log db error: %v\n", err)
-		os.Exit(1)
-	}
-
 	dbResource, ok := rs.(*resource.DbResource)
 	if !ok {
 		fmt.Fprintf(os.Stderr, "get dbresource error: %v\n", err)
@ -126,7 +117,6 @@ func main() {

 	lhs, err := handlers.NewLocalHandlerService(ctx, pfp, true, dbResource, cfg, rs)
 	lhs.SetDataStore(&userdatastore)
-	lhs.SetLogDb(&logdb)
 	lhs.SetPersister(pe)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "localhandler service error: %v\n", err)
@ -134,26 +124,28 @@ func main() {
 	}

 	accountService := services.New(ctx, menuStorageService)
-	_, err = lhs.GetHandler(accountService)
+	hl, err := lhs.GetHandler(accountService)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "get accounts service handler: %v\n", err)
 		os.Exit(1)
 	}
-	en := lhs.GetEngine(cfg, rs, pe)
+
+	en := lhs.GetEngine()
+	en = en.WithFirst(hl.Init)
+	if engineDebug {
+		en = en.WithDebug(nil)
+	}

 	cint := make(chan os.Signal)
 	cterm := make(chan os.Signal)
 	signal.Notify(cint, os.Interrupt, syscall.SIGINT)
 	signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)
 	go func() {
-		var s os.Signal
 		select {
-		case s = <-cterm:
-		case s = <-cint:
+		case _ = <-cint:
+		case _ = <-cterm:
 		}
-		logg.InfoCtxf(ctx, "stopping on signal", "sig", s)
-		en.Finish(ctx)
-		os.Exit(0)
+		menuStorageService.Close(ctx)
 	}()

 	err = engine.Loop(ctx, en, os.Stdin, os.Stdout, nil)
--- a/cmd/ssh/main.go
+++ b/cmd/ssh/main.go
@ -31,25 +31,25 @@ var (
 func main() {
 	config.LoadConfig()

-	override := config.NewOverride()
+	var override config.Override
 	var authConnStr string
 	var size uint
 	var engineDebug bool
 	var stateDebug bool
 	var host string
 	var port uint
-	
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource connection string")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
+	//flag.StringVar(&authConnStr, "authdb", "", "auth connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.UintVar(&size, "s", 160, "max size of output")
 	flag.StringVar(&host, "h", config.HostSSH(), "socket host")
 	flag.UintVar(&port, "p", config.PortSSH(), "socket port")
 	flag.Parse()

-	config.Apply(override)
+	config.Apply(&override)
 	conns, err := config.GetConns()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
@ -84,7 +84,6 @@ func main() {
 		Root:       "root",
 		OutputSize: uint32(size),
 		FlagCount:  uint32(128),
-		ResetOnEmptyInput: true,
 	}
 	if stateDebug {
 		cfg.StateDebug = true
@ -112,13 +111,13 @@ func main() {
 	signal.Notify(cterm, os.Interrupt, syscall.SIGTERM)

 	runner := &ssh.SshRunner{
-		Cfg:        cfg,
-		Debug:      engineDebug,
-		FlagFile:   pfp,
-		Conn:       conns,
-		SrvKeyFile: sshKeyFile,
-		Host:       host,
-		Port:       port,
+		Cfg: cfg,
+		Debug: engineDebug,
+		FlagFile: pfp,
+		Conn: conns,
+		SrvKeyFile:  sshKeyFile,
+		Host:        host,
+		Port:        port,
 	}
 	go func() {
 		select {
--- a/config/args.go
+++ b/config/args.go
@ -2,19 +2,30 @@ package config

 import (
 	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )

-func NewOverride() *viseconfig.Override {
-	o := &viseconfig.Override{
-		StateConnMode:    storage.DBMODE_TEXT,
-		ResourceConnMode: storage.DBMODE_TEXT,
-		UserConnMode:     storage.DBMODE_BINARY,
+type Override struct {
+	DbConn *string
+	StateConn *string
+	ResourceConn *string
+	UserConn *string
+}
+
+func NewOverride() *Override {
+	var a string
+	var b string
+	var c string
+	var d string
+	o := &Override{
+		DbConn: &a,
+		StateConn: &b,
+		ResourceConn: &c,
+		UserConn: &d,
 	}
 	return o
 }

-func Apply(o *viseconfig.Override) error {
-	viseconfig.ApplyConn(o)
+func Apply(o *Override) error {
+	viseconfig.ApplyConn(o.DbConn, o.StateConn, o.ResourceConn, o.UserConn)
 	return nil
 }
--- a/config/config.go
+++ b/config/config.go
@ -1,16 +1,14 @@
 package config

 import (
-	"strings"
-
-	apiconfig "git.grassecon.net/grassrootseconomics/sarafu-api/config"
-	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
 	"git.grassecon.net/grassrootseconomics/visedriver/env"
+	viseconfig "git.grassecon.net/grassrootseconomics/visedriver/config"
+	apiconfig "git.grassecon.net/grassrootseconomics/sarafu-api/config"
 )

 var (
 	GetConns = viseconfig.GetConns
-	EnvPath  string
+	EnvPath string
 )

 func loadEnv() {
@ -22,11 +20,10 @@ func loadEnv() {
 }

 const (
-	defaultSSHHost  string = "127.0.0.1"
-	defaultSSHPort  uint   = 7122
+	defaultSSHHost string = "127.0.0.1"
+	defaultSSHPort uint = 7122
 	defaultHTTPHost string = "127.0.0.1"
-	defaultHTTPPort uint   = 7123
-	defaultDomain          = "sarafu.local"
+	defaultHTTPPort uint = 7123
 )

 func LoadConfig() error {
@ -42,16 +39,6 @@ func LoadConfig() error {
 	return nil
 }

-func SearchDomains() []string {
-	var ParsedDomains []string
-	SearchDomains := env.GetEnv("ALIAS_SEARCH_DOMAINS", defaultDomain)
-	SearchDomainList := strings.Split(env.GetEnv("ALIAS_SEARCH_DOMAINS", SearchDomains), ",")
-	for _, domain := range SearchDomainList {
-		ParsedDomains = append(ParsedDomains, strings.ReplaceAll(domain, " ", ""))
-	}
-	return ParsedDomains
-}
-
 func Language() string {
 	return viseconfig.DefaultLanguage
 }
@ -75,15 +62,3 @@ func PortSSH() uint {
 func ATEndpoint() string {
 	return env.GetEnv("AT_ENDPOINT", "/")
 }
-
-func DefaultPoolAddress() string {
-	return env.GetEnv("DEFAULT_POOL_CONTRACT_ADDRESS", "")
-}
-
-func DefaultPoolName() string {
-	return env.GetEnv("DEFAULT_POOL_NAME", "")
-}
-
-func DefaultPoolSymbol() string {
-	return env.GetEnv("DEFAULT_POOL_SYMBOL", "")
-}
--- a/debug/db.go
+++ b/debug/db.go
@ -1,11 +1,11 @@
 package debug

 import (
-	"encoding/binary"
 	"fmt"
+	"encoding/binary"

-	visedb "git.defalsify.org/vise.git/db"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	visedb "git.defalsify.org/vise.git/db"
 )

 var (
@ -13,10 +13,10 @@ var (
 )

 type KeyInfo struct {
-	SessionId   string
-	Typ         uint8
-	SubTyp      storedb.DataTyp
-	Label       string
+	SessionId string
+	Typ uint8
+	SubTyp storedb.DataTyp
+	Label string
 	Description string
 }

@ -53,11 +53,12 @@ func ToKeyInfo(k []byte, sessionId string) (KeyInfo, error) {
 		k = k[2:]
 	}

+
 	return o, nil
 }

 func subTypToString(v storedb.DataTyp) string {
-	return dbTypStr[v+visedb.DATATYPE_USERDATA+1]
+	return dbTypStr[v + visedb.DATATYPE_USERDATA + 1]
 }

 func typToString(v uint8) string {
--- a/debug/db_debug.go
+++ b/debug/db_debug.go
@ -1,4 +1,3 @@
-//go:build debugdb
 // +build debugdb

 package debug
@ -12,37 +11,37 @@ import (
 func init() {
 	DebugCap |= 1
 	dbTypStr[db.DATATYPE_STATE] = "internal state"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TRACKING_ID] = "tracking id"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_PUBLIC_KEY] = "public key"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACCOUNT_PIN] = "account pin"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_FIRST_NAME] = "first name"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_FAMILY_NAME] = "family name"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_YOB] = "year of birth"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_LOCATION] = "location"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_GENDER] = "gender"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_OFFERINGS] = "offerings"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_RECIPIENT] = "recipient"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_AMOUNT] = "amount"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TEMPORARY_VALUE] = "temporary value"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_SYM] = "active sym"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_BAL] = "active bal"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_BLOCKED_NUMBER] = "blocked number"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_PUBLIC_KEY_REVERSE] = "public_key_reverse"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_DECIMAL] = "active decimal"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_ACTIVE_ADDRESS] = "active address"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_INCORRECT_PIN_ATTEMPTS] = "incorrect pin attempts"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_SELECTED_LANGUAGE_CODE] = "selected language"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_INITIAL_LANGUAGE_CODE] = "initial language"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_SYMBOLS] = "voucher symbols"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_BALANCES] = "voucher balances"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_DECIMALS] = "voucher decimals"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_VOUCHER_ADDRESSES] = "voucher addresses"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_SENDERS] = "tx senders"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_RECIPIENTS] = "tx recipients"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_VALUES] = "tx values"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_ADDRESSES] = "tx addresses"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_HASHES] = "tx hashes"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_DATES] = "tx dates"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_SYMBOLS] = "tx symbols"
-	dbTypStr[db.DATATYPE_USERDATA+1+storedb.DATA_TX_DECIMALS] = "tx decimals"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TRACKING_ID] = "tracking id"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_PUBLIC_KEY] = "public key"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACCOUNT_PIN] = "account pin"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_FIRST_NAME] = "first name"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_FAMILY_NAME] = "family name"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_YOB] = "year of birth"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_LOCATION] = "location"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_GENDER] = "gender"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_OFFERINGS] = "offerings"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_RECIPIENT] = "recipient"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_AMOUNT] = "amount"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TEMPORARY_VALUE] = "temporary value"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_SYM] = "active sym"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_BAL] = "active bal"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_BLOCKED_NUMBER] = "blocked number"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_PUBLIC_KEY_REVERSE] = "public_key_reverse"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_DECIMAL] = "active decimal"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_ACTIVE_ADDRESS] = "active address"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_INCORRECT_PIN_ATTEMPTS] = "incorrect pin attempts"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_SELECTED_LANGUAGE_CODE] = "selected language"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_INITIAL_LANGUAGE_CODE] = "initial language"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_SYMBOLS] = "voucher symbols"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_BALANCES] = "voucher balances"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_DECIMALS] = "voucher decimals"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_VOUCHER_ADDRESSES] = "voucher addresses"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_SENDERS] = "tx senders"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_RECIPIENTS] = "tx recipients"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_VALUES] = "tx values"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_ADDRESSES] = "tx addresses"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_HASHES] = "tx hashes"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_DATES] = "tx dates"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_SYMBOLS] = "tx symbols"
+	dbTypStr[db.DATATYPE_USERDATA + 1 + storedb.DATA_TX_DECIMALS] = "tx decimals"
 }
--- a/debug/db_test.go
+++ b/debug/db_test.go
@ -3,8 +3,8 @@ package debug
 import (
 	"testing"

-	visedb "git.defalsify.org/vise.git/db"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	visedb "git.defalsify.org/vise.git/db"
 )

 func TestDebugDbSubKeyInfo(t *testing.T) {
@ -24,7 +24,7 @@ func TestDebugDbSubKeyInfo(t *testing.T) {
 	if r.SubTyp != 2 {
 		t.Fatalf("expected 2, got %d", r.SubTyp)
 	}
-	if DebugCap&1 > 0 {
+	if DebugCap & 1 > 0 {
 		if r.Label != "tracking id" {
 			t.Fatalf("expected 'tracking id', got '%s'", r.Label)
 		}
@ -45,7 +45,7 @@ func TestDebugDbKeyInfo(t *testing.T) {
 	if r.Typ != 16 {
 		t.Fatalf("expected 16, got %d", r.Typ)
 	}
-	if DebugCap&1 > 0 {
+	if DebugCap & 1 > 0 {
 		if r.Label != "internal state" {
 			t.Fatalf("expected 'internal_state', got '%s'", r.Label)
 		}
@ -68,7 +68,7 @@ func TestDebugDbKeyInfoRestore(t *testing.T) {
 	if r.Typ != 32 {
 		t.Fatalf("expected 32, got %d", r.Typ)
 	}
-	if DebugCap&1 > 0 {
+	if DebugCap & 1 > 0 {
 		if r.Label != "active sym" {
 			t.Fatalf("expected 'active sym', got '%s'", r.Label)
 		}
--- a/devtools/admin/main.go
+++ b/devtools/admin/main.go
@ -10,31 +10,30 @@ import (
 	"git.defalsify.org/vise.git/logging"

 	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/cmd"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/internal/cmd"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 )

 var (
-	logg      = logging.NewVanilla().WithContextKey("SessionId")
-	scriptDir = path.Join("services", "registration")
+	logg = logging.NewVanilla().WithContextKey("SessionId")
+	scriptDir     = path.Join("services", "registration")
 )

 func main() {
 	config.LoadConfig()

-	override := config.NewOverride()
 	var sessionId string
+	var override config.Override

 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.Parse()

-	config.Apply(override)
+	config.Apply(&override)
 	conns, err := config.GetConns()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
@ -42,6 +41,7 @@ func main() {
 	}

 	ctx := context.Background()
+	ctx = context.WithValue(ctx, "SessionId", sessionId)

 	pfp := path.Join(scriptDir, "pp.csv")
 	flagParser, err := application.NewFlagManager(pfp)
--- a/devtools/lang/main.go
+++ b/devtools/lang/main.go
@ -8,17 +8,18 @@ import (
 	"path"
 	"strings"

-	"git.defalsify.org/vise.git/lang"
 	"git.defalsify.org/vise.git/logging"
+	"git.defalsify.org/vise.git/lang"
 	"git.grassecon.net/grassrootseconomics/visedriver/config"
 )

 const (
+	
 	changeHeadSrc = `LOAD reset_account_authorized 0
 LOAD reset_incorrect 0
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
-`
+` 

 	selectSrc = `LOAD set_language 6
 RELOAD set_language
@ -28,8 +29,8 @@ MOVE language_changed
 )

 var (
-	logg   = logging.NewVanilla()
-	mouts  string
+	logg = logging.NewVanilla()
+	mouts string
 	incmps string
 )

@ -62,7 +63,7 @@ func main() {
 	}
 	logg.Tracef("using languages", "lang", config.Languages)

-	for i, v := range config.Languages {
+	for i, v := range(config.Languages) {
 		ln, err := lang.LanguageFromCode(v)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "error parsing language: %s\n", v)
@ -75,7 +76,7 @@ func main() {
 		incmps += fmt.Sprintf("INCMP %s %v\n", v, n)

 		p := path.Join(srcDir, v)
-		w, err := os.OpenFile(p, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
+		w, err := os.OpenFile(p, os.O_WRONLY | os.O_CREATE | os.O_EXCL, 0600)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "failed open language set template output: %v\n", err)
 			os.Exit(1)
@ -92,7 +93,7 @@ func main() {
 	src += "INCMP . *\n"

 	p := path.Join(srcDir, "select_language.vis")
-	w, err := os.OpenFile(p, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
+	w, err := os.OpenFile(p, os.O_WRONLY | os.O_CREATE | os.O_EXCL, 0600)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed open select language vis output: %v\n", err)
 		os.Exit(1)
@ -106,7 +107,7 @@ func main() {

 	src = changeHeadSrc + src
 	p = path.Join(srcDir, "change_language.vis")
-	w, err = os.OpenFile(p, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0600)
+	w, err = os.OpenFile(p, os.O_WRONLY | os.O_CREATE | os.O_EXCL, 0600)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "failed open select language vis output: %v\n", err)
 		os.Exit(1)
--- a/devtools/store/dump/main.go
+++ b/devtools/store/dump/main.go
@ -7,11 +7,11 @@ import (
 	"os"
 	"path"

+	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/debug"
 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/config"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/debug"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 )

 var (
@ -32,7 +32,7 @@ func formatItem(k []byte, v []byte, sessionId string) (string, error) {
 func main() {
 	config.LoadConfig()

-	override := config.NewOverride()
+	var override config.Override
 	var sessionId string
 	var database string
 	var engineDebug bool
@ -40,14 +40,14 @@ func main() {
 	var first bool

 	flag.StringVar(&sessionId, "session-id", "075xx2123", "session id")
-	flag.StringVar(&override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
-	flag.StringVar(&override.ResourceConn, "resource", "?", "resource data directory")
-	flag.StringVar(&override.UserConn, "userdata", "?", "userdata store connection string")
-	flag.StringVar(&override.StateConn, "state", "?", "state store connection string")
+	flag.StringVar(override.DbConn, "c", "?", "default connection string (replaces all unspecified strings)")
+	flag.StringVar(override.ResourceConn, "resource", "?", "resource connection string")
+	flag.StringVar(override.UserConn, "userdata", "?", "userdata store connection string")
+	flag.StringVar(override.StateConn, "state", "?", "state store connection string")
 	flag.BoolVar(&engineDebug, "d", false, "use engine debug output")
 	flag.Parse()

-	config.Apply(override)
+	config.Apply(&override)
 	conns, err := config.GetConns()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "conn specification error: %v\n", err)
--- a/go.mod
+++ b/go.mod
@ -3,14 +3,14 @@ module git.grassecon.net/grassrootseconomics/sarafu-vise
 go 1.23.4

 require (
-	git.defalsify.org/vise.git v0.3.2-0.20250507172020-cb22240f1cb9
-	git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521141246-6c3719e3b652
-	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306
-	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694
+	git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9
+	git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805
+	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250121134912-f7d31e4e8162
+	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84
 	github.com/alecthomas/assert/v2 v2.2.2
 	github.com/gofrs/uuid v4.4.0+incompatible
-	github.com/grassrootseconomics/ussd-data-service v1.4.7-beta
+	github.com/grassrootseconomics/ussd-data-service v1.2.0-beta
 	github.com/jackc/pgx/v5 v5.7.1
 	github.com/peteole/testdata-loader v0.3.0
 	github.com/stretchr/testify v1.9.0
@ -19,50 +19,24 @@ require (
 )

 require (
-	github.com/Microsoft/go-winio v0.6.2 // indirect
-	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/alecthomas/participle/v2 v2.0.0 // indirect
 	github.com/alecthomas/repr v0.2.0 // indirect
 	github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c // indirect
-	github.com/bits-and-blooms/bitset v1.14.3 // indirect
-	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
-	github.com/consensys/bavard v0.1.13 // indirect
-	github.com/consensys/gnark-crypto v0.12.1 // indirect
-	github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c // indirect
-	github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/deckarep/golang-set/v2 v2.6.0 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
-	github.com/ethereum/c-kzg-4844 v1.0.0 // indirect
-	github.com/ethereum/go-ethereum v1.14.9 // indirect
-	github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 // indirect
 	github.com/fxamacker/cbor/v2 v2.4.0 // indirect
-	github.com/go-ole/go-ole v1.3.0 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/grassrootseconomics/eth-custodial v1.3.0-beta // indirect
-	github.com/grassrootseconomics/ethutils v1.3.1 // indirect
 	github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
-	github.com/holiman/uint256 v1.3.1 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
 	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
-	github.com/lmittmann/w3 v0.17.1 // indirect
 	github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a // indirect
-	github.com/mmcloughlin/addchain v0.4.0 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/supranational/blst v0.3.11 // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.29.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
-	golang.org/x/time v0.7.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	rsc.io/tmplfunc v0.0.3 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,31 +1,13 @@
-git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce h1:Uke2jQ4wG97gQKnTzxPyBGyhosrU1IWnRNFHtKVrmrk=
-git.defalsify.org/vise.git v0.3.2-0.20250425131748-8b84f59792ce/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.defalsify.org/vise.git v0.3.2-0.20250507172020-cb22240f1cb9 h1:4kjbYw25MHZe9fqSbujPzpFXrYutFfVipvLrcWYnYks=
-git.defalsify.org/vise.git v0.3.2-0.20250507172020-cb22240f1cb9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
-git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e h1:DcC9qkNl9ny3hxQmsMK6W81+5R/j4ZwYUbvewMI/rlc=
-git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250428082711-5d221b8d565f h1:OAHCP3YR1C5h1WFnnEnLs5kn6jTxQHQYWYtQaMZJIMY=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250428082711-5d221b8d565f/go.mod h1:gOn89ipaDcDvmQXRMQYKUqcw/sJcwVOPVt2eC6Geip8=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250516094326-3b85167ad84a h1:QNh0NaKtGbSeRPlTVKEAnqc0R5rnVrpDMrCHD/EaU5U=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250516094326-3b85167ad84a/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517113706-ee434dba6980 h1:FQUwTDFWduY7gCMi1U2OiFlsuAHLojWUw2hvZ4cGC2s=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517113706-ee434dba6980/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517114512-050998ff82b1 h1:0hvILlGkZnXO8o7nZth4xu77vAS4zVQ6Ae0rb5x/Idg=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517114512-050998ff82b1/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250520125035-81fbc2574c30 h1:iZVmR/4xSoxahtkMBXs/z1HUSSnr+x1m+9AxXIgTvb0=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250520125035-81fbc2574c30/go.mod h1:R7+mt27mhm4/LCutAHHv87pOsLxXEPO93KXnhP8H6W0=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521124206-343d30a2f27c h1:c2cA5hcYnLgs7kR4fF5tp42W6VQClTukbfKoaeskZu0=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521124206-343d30a2f27c/go.mod h1:R7+mt27mhm4/LCutAHHv87pOsLxXEPO93KXnhP8H6W0=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521141246-6c3719e3b652 h1:MmUQRL6Fjq/jlL53h+cUbJ7WwQ+q/yNy/zT05c7bgNg=
-git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521141246-6c3719e3b652/go.mod h1:wKHPy1mpOCr9ahkRltwm1yi9qH/3m9xb8hMCX5C0L1o=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 h1:Jo+yWysWw/N5BJQtAyEMN8ePVvAyPHv+JG4lQti+1N4=
-git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306/go.mod h1:FdLwYtzsjOIcDiW4uDgDYnB4Wdzq12uJUe0QHSSPbSo=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E=
-git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
-github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
-github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
-github.com/StackExchange/wmi v1.2.1 h1:VIkavFPXSjcnS+O8yTq7NI32k0R5Aj+v39y29VYDOSA=
-github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
+git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9 h1:sPcqXQcywxA8W3W+9qQncLPmsrgqTIlec7vmD4/7vyA=
+git.defalsify.org/vise.git v0.2.3-0.20250120121301-10739fb4a8c9/go.mod h1:jyBMe1qTYUz3mmuoC9JQ/TvFeW0vTanCUcPu3H8p4Ck=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d h1:5mzLas+jxTUtusOKx4XvU+n2QvrV/mH17MnJRy46siQ=
+git.grassecon.net/grassrootseconomics/common v0.0.0-20250121134736-ba8cbbccea7d/go.mod h1:wgQJZGIS6QuNLHqDhcsvehsbn5PvgV7aziRebMnJi60=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805 h1:deGnqf4YCsbxhXgjFEjYjTUCvciLEmI26T9IysRsQXY=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.0.0-20250121135150-e0b539809805/go.mod h1:9bc3d//Qqm11hz7GYRdQc1Uan+0GJIOpvRBbv8cHMu8=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250121134912-f7d31e4e8162 h1:NaPbgGQ1Nb+yYF+Qj1LSagpjYeDcSXST8iZwONg4afY=
+git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250121134912-f7d31e4e8162/go.mod h1:pjKp9L/ZsWW3kMB0UoIl1yv9TBIuU33mn9Aghxp7vGk=
+git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84 h1:VoBmqsjlRdz+IPbtKsAkc1IrMepjR+QlesZT31Jokrk=
+git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250121135340-ca97e23e8c84/go.mod h1:DpibtYpnT3nG4Kn556hRAkdu4+CtiI/6MbnQHal51mQ=
 github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
 github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
 github.com/alecthomas/participle/v2 v2.0.0 h1:Fgrq+MbuSsJwIkw3fEj9h75vDP0Er5JzepJ0/HNHv0g=
@ -34,60 +16,21 @@ github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk
 github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c h1:H9Nm+I7Cg/YVPpEV1RzU3Wq2pjamPc/UtHDgItcb7lE=
 github.com/barbashov/iso639-3 v0.0.0-20211020172741-1f4ffb2d8d1c/go.mod h1:rGod7o6KPeJ+hyBpHfhi4v7blx9sf+QsHsA7KAsdN6U=
-github.com/bits-and-blooms/bitset v1.14.3 h1:Gd2c8lSNf9pKXom5JtD7AaKO8o7fGQ2LtFj1436qilA=
-github.com/bits-and-blooms/bitset v1.14.3/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
-github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=
-github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
-github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ=
-github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI=
-github.com/consensys/gnark-crypto v0.12.1 h1:lHH39WuuFgVHONRl3J0LRBtuYdQTumFSDtJF7HpyG8M=
-github.com/consensys/gnark-crypto v0.12.1/go.mod h1:v2Gy7L/4ZRosZ7Ivs+9SfUDr0f5UlG+EM5t7MPHiLuY=
-github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c h1:uQYC5Z1mdLRPrZhHjHxufI8+2UG/i25QG92j0Er9p6I=
-github.com/crate-crypto/go-ipa v0.0.0-20240223125850-b1e8a79f509c/go.mod h1:geZJZH3SzKCqnz5VT0q/DyIG/tvu/dZk+VIfXicupJs=
-github.com/crate-crypto/go-kzg-4844 v1.0.0 h1:TsSgHwrkTKecKJ4kadtHi4b3xHW5dCFUDFnUp1TsawI=
-github.com/crate-crypto/go-kzg-4844 v1.0.0/go.mod h1:1kMhvPgI0Ky3yIa+9lFySEBUBXkYxeOi8ZF1sYioxhc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=
-github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
-github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc=
-github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
-github.com/ethereum/c-kzg-4844 v1.0.0 h1:0X1LBXxaEtYD9xsyj9B9ctQEZIpnvVDeoBx8aHEwTNA=
-github.com/ethereum/c-kzg-4844 v1.0.0/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
-github.com/ethereum/go-ethereum v1.14.9 h1:J7iwXDrtUyE9FUjUYbd4c9tyzwMh6dTJsKzo9i6SrwA=
-github.com/ethereum/go-ethereum v1.14.9/go.mod h1:QeW+MtTpRdBEm2pUFoonByee8zfHv7kGp0wK0odvU1I=
-github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9 h1:8NfxH2iXvJ60YRB8ChToFTUzl8awsc3cJ8CbLjGIl/A=
-github.com/ethereum/go-verkle v0.1.1-0.20240829091221-dffa7562dbe9/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
 github.com/fxamacker/cbor/v2 v2.4.0 h1:ri0ArlOR+5XunOP8CRUowT0pSJOwhW098ZCUyskZD88=
 github.com/fxamacker/cbor/v2 v2.4.0/go.mod h1:TA1xS00nchWmaBnEIxPSE5oHLuJBAVvqrtAnWBwBCVo=
-github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
-github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
 github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1YrTJupqA=
 github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
-github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
-github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grassrootseconomics/eth-custodial v1.3.0-beta h1:twrMBhl89GqDUL9PlkzQxMP/6OST1BByrNDj+rqXDmU=
 github.com/grassrootseconomics/eth-custodial v1.3.0-beta/go.mod h1:7uhRcdnJplX4t6GKCEFkbeDhhjlcaGJeJqevbcvGLZo=
-github.com/grassrootseconomics/ethutils v1.3.1 h1:LlQO90HjJkl7ejC8fv6jP7RJUrAm1j4VMMCYfsoIrhU=
-github.com/grassrootseconomics/ethutils v1.3.1/go.mod h1:Wuv1VEZrkLIXqTSEYI3Nh9HG/ZHOUQ+U+xvWJ8QtjgQ=
 github.com/grassrootseconomics/ussd-data-service v1.2.0-beta h1:fn1gwbWIwHVEBtUC2zi5OqTlfI/5gU1SMk0fgGixIXk=
 github.com/grassrootseconomics/ussd-data-service v1.2.0-beta/go.mod h1:omfI0QtUwIdpu9gMcUqLMCG8O1XWjqJGBx1qUMiGWC0=
-github.com/grassrootseconomics/ussd-data-service v1.4.0-beta h1:4fMd/3h2ZIhRg4GdHQmRw5FfD3MpJvFNNJQo+Q27f5M=
-github.com/grassrootseconomics/ussd-data-service v1.4.0-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
-github.com/grassrootseconomics/ussd-data-service v1.4.4-beta h1:turlyo0i3OLj29mWpWNoB/3Qao8qEngT/5d1jDWTZE4=
-github.com/grassrootseconomics/ussd-data-service v1.4.4-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
-github.com/grassrootseconomics/ussd-data-service v1.4.7-beta h1:yAe1YaOBsdxW2m20jnVU4F0kLmFr+mK/gHCWEdHmE90=
-github.com/grassrootseconomics/ussd-data-service v1.4.7-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/holiman/uint256 v1.3.1 h1:JfTzmih28bittyHM8z360dCjIA9dbPIBlcTI6lmctQs=
-github.com/holiman/uint256 v1.3.1/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
@ -102,13 +45,8 @@ github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lmittmann/w3 v0.17.1 h1:zdXIimmNmYfqOFur+Jqc9Yqwtq6jwnsQufbTOnSAtW4=
-github.com/lmittmann/w3 v0.17.1/go.mod h1:WVUGMbL83WYBu4Sge3SVlW3qIG4VaHe+S8+UUnwz9Eg=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a h1:0Q3H0YXzMHiciXtRcM+j0jiCe8WKPQHoRgQiRTnfcLY=
 github.com/mattn/kinako v0.0.0-20170717041458-332c0a7e205a/go.mod h1:CdTTBOYzS5E4mWS1N8NWP6AHI19MP0A2B18n3hLzRMk=
-github.com/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY=
-github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU=
-github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
 github.com/pashagolub/pgxmock/v4 v4.3.0 h1:DqT7fk0OCK6H0GvqtcMsLpv8cIwWqdxWgfZNLeHCb/s=
 github.com/pashagolub/pgxmock/v4 v4.3.0/go.mod h1:9VoVHXwS3XR/yPtKGzwQvwZX1kzGB9sM8SviDcHDa3A=
 github.com/peteole/testdata-loader v0.3.0 h1:8jckE9KcyNHgyv/VPoaljvKZE0Rqr8+dPVYH6rfNr9I=
@ -118,8 +56,6 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
-github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU=
-github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
@ -127,32 +63,18 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4=
-github.com/supranational/blst v0.3.11/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
-github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
-github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
-github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
-github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
 github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
 golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
 golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
-golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
-golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
 golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
 golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
 golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
-golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ=
-golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@ -161,5 +83,3 @@ gopkg.in/leonelquinteros/gotext.v1 v1.3.1/go.mod h1:X1WlGDeAFIYsW6GjgMm4VwUwZ2Xj
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU=
-rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA=
--- a/handlers/application/menuhandler.go
+++ b/handlers/application/menuhandler.go
--- a/handlers/application/menuhandler_test.go
+++ b/handlers/application/menuhandler_test.go
--- a/handlers/event/custodial.go
+++ b/handlers/event/custodial.go
@ -35,6 +35,13 @@ func (eu *EventsUpdater) HandleCustodialRegistration(ctx context.Context, ev *ap
 	if err != nil {
 		return err
 	}
+//	err = pe.Load(identity.SessionId)
+//	if err != nil {
+//		return err
+//	}
+//	st := pe.GetState()
+//	st.SetFlag(accountCreatedFlag)
+//	return pe.Save(identity.SessionId)
 	logg.DebugCtxf(ctx, "received custodial registration event", "identity", identity)
 	return nil
 }
--- a/handlers/event/event.go
+++ b/handlers/event/event.go
@ -4,12 +4,12 @@ import (
 	"context"
 	"fmt"

-	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/persist"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	"git.defalsify.org/vise.git/logging"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 )

 var (
@ -17,9 +17,9 @@ var (
 )

 type EventsUpdater struct {
-	api        remote.AccountService
+	api remote.AccountService
 	formatFunc func(string, int, any) string
-	store      storage.StorageService
+	store storage.StorageService 
 }

 func NewEventsUpdater(api remote.AccountService, store storage.StorageService) *EventsUpdater {
--- a/handlers/event/token.go
+++ b/handlers/event/token.go
@ -6,13 +6,13 @@ import (
 	"strings"

 	"git.defalsify.org/vise.git/db"
-	"git.grassecon.net/grassrootseconomics/common/identity"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
+	"git.grassecon.net/grassrootseconomics/common/identity"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
 )

-// execute all
+// execute all 
 func (eu *EventsUpdater) updateToken(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore, tokenAddress string) error {
 	err := eu.updateTokenList(ctx, identity, userStore)
 	if err != nil {
@ -47,16 +47,19 @@ func (eu *EventsUpdater) updateToken(ctx context.Context, identity identity.Iden
 	return nil
 }

+
 // set default token to given symbol.
 func (eu *EventsUpdater) updateDefaultToken(ctx context.Context, identity identity.Identity, userStore *store.UserDataStore, activeSym string) error {
+	pfxDb := toPrefixDb(userStore, identity.SessionId)
 	// TODO: the activeSym input should instead be newline separated list?
-	tokenData, err := store.GetVoucherData(ctx, userStore, identity.SessionId, activeSym)
+	tokenData, err := store.GetVoucherData(ctx, pfxDb, activeSym)
 	if err != nil {
 		return err
 	}
 	return store.UpdateVoucherData(ctx, userStore, identity.SessionId, tokenData)
 }

+
 // handle token transfer.
 //
 // if from and to are NOT the same, handle code will be executed once for each side of the transfer.
@ -186,7 +189,7 @@ func (eu *EventsUpdater) updateTokenTransferList(ctx context.Context, identity i
 		return err
 	}

-	for i, tx := range txs {
+	for i, tx := range(txs) {
 		r = append(r, eu.formatFunc(apievent.EventTokenTransferTag, i, tx))
 	}

--- a/handlers/local.go
+++ b/handlers/local.go
@ -6,7 +6,6 @@ import (

 	"git.defalsify.org/vise.git/db"
 	"git.defalsify.org/vise.git/engine"
-	"git.defalsify.org/vise.git/logging"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"

@ -14,10 +13,6 @@ import (
 	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 )

-var (
-	logg = logging.NewVanilla().WithDomain("sarafu-vise.engine")
-)
-
 type HandlerService interface {
 	GetHandler() (*application.MenuHandlers, error)
 }
@ -27,10 +22,8 @@ type LocalHandlerService struct {
 	DbRs          *resource.DbResource
 	Pe            *persist.Persister
 	UserdataStore *db.Db
-	LogDb         *db.Db
 	Cfg           engine.Config
 	Rs            resource.Resource
-	first         resource.EntryFunc
 }

 func NewLocalHandlerService(ctx context.Context, fp string, debug bool, dbResource *resource.DbResource, cfg engine.Config, rs resource.Resource) (*LocalHandlerService, error) {
@ -58,19 +51,16 @@ func (ls *LocalHandlerService) SetDataStore(db *db.Db) {
 	ls.UserdataStore = db
 }

-func (ls *LocalHandlerService) SetLogDb(db *db.Db) {
-	ls.LogDb = db
-}
-
 func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService) (*application.MenuHandlers, error) {
 	replaceSeparatorFunc := func(input string) string {
 		return strings.ReplaceAll(input, ":", ls.Cfg.MenuSeparator)
 	}

-	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, *ls.LogDb, accountService, replaceSeparatorFunc)
+	appHandlers, err := application.NewMenuHandlers(ls.Parser, *ls.UserdataStore, accountService, replaceSeparatorFunc)
 	if err != nil {
 		return nil, err
 	}
+	//appHandlers = appHandlers.WithPersister(ls.Pe)
 	appHandlers.SetPersister(ls.Pe)
 	ls.DbRs.AddLocalFunc("check_blocked_status", appHandlers.CheckBlockedStatus)
 	ls.DbRs.AddLocalFunc("set_language", appHandlers.SetLanguage)
@ -104,18 +94,23 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("verify_yob", appHandlers.VerifyYob)
 	ls.DbRs.AddLocalFunc("reset_incorrect_date_format", appHandlers.ResetIncorrectYob)
 	ls.DbRs.AddLocalFunc("initiate_transaction", appHandlers.InitiateTransaction)
+	ls.DbRs.AddLocalFunc("verify_new_pin", appHandlers.VerifyNewPin)
 	ls.DbRs.AddLocalFunc("confirm_pin_change", appHandlers.ConfirmPinChange)
 	ls.DbRs.AddLocalFunc("quit_with_help", appHandlers.QuitWithHelp)
 	ls.DbRs.AddLocalFunc("fetch_community_balance", appHandlers.FetchCommunityBalance)
-	ls.DbRs.AddLocalFunc("manage_vouchers", appHandlers.ManageVouchers)
+	ls.DbRs.AddLocalFunc("set_default_voucher", appHandlers.SetDefaultVoucher)
+	ls.DbRs.AddLocalFunc("check_vouchers", appHandlers.CheckVouchers)
 	ls.DbRs.AddLocalFunc("get_vouchers", appHandlers.GetVoucherList)
 	ls.DbRs.AddLocalFunc("view_voucher", appHandlers.ViewVoucher)
 	ls.DbRs.AddLocalFunc("set_voucher", appHandlers.SetVoucher)
 	ls.DbRs.AddLocalFunc("get_voucher_details", appHandlers.GetVoucherDetails)
+	ls.DbRs.AddLocalFunc("reset_valid_pin", appHandlers.ResetValidPin)
+	ls.DbRs.AddLocalFunc("check_pin_mismatch", appHandlers.CheckBlockedNumPinMisMatch)
 	ls.DbRs.AddLocalFunc("validate_blocked_number", appHandlers.ValidateBlockedNumber)
 	ls.DbRs.AddLocalFunc("retrieve_blocked_number", appHandlers.RetrieveBlockedNumber)
 	ls.DbRs.AddLocalFunc("reset_unregistered_number", appHandlers.ResetUnregisteredNumber)
 	ls.DbRs.AddLocalFunc("reset_others_pin", appHandlers.ResetOthersPin)
+	ls.DbRs.AddLocalFunc("save_others_temporary_pin", appHandlers.SaveOthersTemporaryPin)
 	ls.DbRs.AddLocalFunc("get_current_profile_info", appHandlers.GetCurrentProfileInfo)
 	ls.DbRs.AddLocalFunc("check_transactions", appHandlers.CheckTransactions)
 	ls.DbRs.AddLocalFunc("get_transactions", appHandlers.GetTransactionsList)
@ -123,30 +118,13 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountService)
 	ls.DbRs.AddLocalFunc("update_all_profile_items", appHandlers.UpdateAllProfileItems)
 	ls.DbRs.AddLocalFunc("set_back", appHandlers.SetBack)
 	ls.DbRs.AddLocalFunc("show_blocked_account", appHandlers.ShowBlockedAccount)
-	ls.DbRs.AddLocalFunc("clear_temporary_value", appHandlers.ClearTemporaryValue)
-	ls.DbRs.AddLocalFunc("reset_invalid_pin", appHandlers.ResetInvalidPIN)
-	ls.DbRs.AddLocalFunc("request_custom_alias", appHandlers.RequestCustomAlias)
-	ls.DbRs.AddLocalFunc("get_suggested_alias", appHandlers.GetSuggestedAlias)
-	ls.DbRs.AddLocalFunc("confirm_new_alias", appHandlers.ConfirmNewAlias)
-	ls.DbRs.AddLocalFunc("check_account_created", appHandlers.CheckAccountCreated)
-	ls.DbRs.AddLocalFunc("reset_api_call_failure", appHandlers.ResetApiCallFailure)
-    ls.DbRs.AddLocalFunc("swap_to_list", appHandlers.LoadSwapToList)
-	ls.DbRs.AddLocalFunc("swap_max_limit", appHandlers.SwapMaxLimit)
-	ls.DbRs.AddLocalFunc("swap_preview", appHandlers.SwapPreview)
-	ls.DbRs.AddLocalFunc("initiate_swap", appHandlers.InitiateSwap)
-	ls.first = appHandlers.Init

 	return appHandlers, nil
 }

-func (ls *LocalHandlerService) GetEngine(cfg engine.Config, rs resource.Resource, pr *persist.Persister) engine.Engine {
-	en := engine.NewEngine(cfg, rs)
-	if ls.first != nil {
-		en = en.WithFirst(ls.first)
-	}
-	en = en.WithPersister(pr)
-	if cfg.EngineDebug {
-		en = en.WithDebug(nil)
-	}
+// TODO: enable setting of sessionId on engine init time
+func (ls *LocalHandlerService) GetEngine() *engine.DefaultEngine {
+	en := engine.NewEngine(ls.Cfg, ls.Rs)
+	en = en.WithPersister(ls.Pe)
 	return en
 }
--- a/internal/cmd/cmd.go
+++ b/internal/cmd/cmd.go
@ -5,8 +5,8 @@ import (
 	"fmt"

 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/application"
 )

 var (
@ -14,17 +14,17 @@ var (
 )

 type Cmd struct {
-	sessionId  string
-	conn       storage.ConnData
+	sessionId string
+	conn storage.ConnData
 	flagParser *application.FlagManager
-	cmd        int
-	enable     bool
-	exec       func(ctx context.Context, ss storage.StorageService) error
+	cmd int
+	enable bool
+	exec func(ctx context.Context, ss storage.StorageService) error
 }

 func NewCmd(sessionId string, flagParser *application.FlagManager) *Cmd {
 	return &Cmd{
-		sessionId:  sessionId,
+		sessionId: sessionId,
 		flagParser: flagParser,
 	}
 }
@ -94,3 +94,5 @@ func (c *Cmd) Parse(args []string) error {

 	return fmt.Errorf("unknown subcommand: %s", cmd)
 }
+
+
--- a/internal/sms/sms.go
+++ b/internal/sms/sms.go
@ -1,96 +0,0 @@
-package sms
-
-import (
-	"context"
-	"fmt"
-
-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/common/phone"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/store"
-	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
-)
-
-var (
-	logg = logging.NewVanilla().WithDomain("smsservice")
-)
-
-type SmsService struct {
-	Accountservice remote.AccountService
-	Userdatastore  store.UserDataStore
-}
-
-// SendUpsellSMS will send an invitation SMS to an unregistered phone number
-func (smsservice *SmsService) SendUpsellSMS(ctx context.Context, inviterPhone, inviteePhone string) error {
-	if !phone.IsValidPhoneNumber(inviterPhone) {
-		return fmt.Errorf("invalid inviter phone number %v", inviterPhone)
-	}
-
-	if !phone.IsValidPhoneNumber(inviteePhone) {
-		return fmt.Errorf("Invalid invitee phone number %v", inviteePhone)
-	}
-	_, err := smsservice.Accountservice.SendUpsellSMS(ctx, inviterPhone, inviteePhone)
-	if err != nil {
-		return fmt.Errorf("Failed to send upsell sms: %v", err)
-	}
-	return nil
-}
-
-// sendPINResetSMS will send an SMS to a user's phonenumber in the event that the associated account's PIN has been reset.
-func (smsService *SmsService) SendPINResetSMS(ctx context.Context, adminPhoneNumber, blockedPhoneNumber string) error {
-	formattedAdminPhone, err := phone.FormatPhoneNumber(adminPhoneNumber)
-	if err != nil {
-		return fmt.Errorf("failed to format admin phone number: %w", err)
-	}
-
-	formattedBlockedPhone, err := phone.FormatPhoneNumber(blockedPhoneNumber)
-	if err != nil {
-		return fmt.Errorf("failed to format blocked phone number: %w", err)
-	}
-
-	if !phone.IsValidPhoneNumber(formattedAdminPhone) {
-		return fmt.Errorf("invalid admin phone number")
-	}
-	if !phone.IsValidPhoneNumber(formattedBlockedPhone) {
-		return fmt.Errorf("invalid blocked phone number")
-	}
-
-	err = smsService.Accountservice.SendPINResetSMS(ctx, formattedAdminPhone, formattedBlockedPhone)
-	if err != nil {
-		return fmt.Errorf("failed to send pin reset sms: %v", err)
-	}
-
-	return nil
-}
-
-// SendAddressSMS will triger an SMS when a user navigates to the my address node.The SMS will be sent to the associated phonenumber.
-func (smsService *SmsService) SendAddressSMS(ctx context.Context) error {
-	store := smsService.Userdatastore
-	sessionId, ok := ctx.Value("SessionId").(string)
-	if !ok {
-		return fmt.Errorf("missing session")
-	}
-
-	publicKey, err := store.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", storedb.DATA_PUBLIC_KEY, "error", err)
-		return err
-	}
-
-	originPhone, err := phone.FormatPhoneNumber(sessionId)
-	if err != nil {
-		logg.DebugCtxf(ctx, "Failed to format origin phonenumber", "sessionid", sessionId)
-		return nil
-	}
-
-	if !phone.IsValidPhoneNumber(originPhone) {
-		logg.InfoCtxf(ctx, "Invalid origin phone number", "origin phonenumber", originPhone)
-		return fmt.Errorf("invalid origin phone number")
-	}
-	err = smsService.Accountservice.SendAddressSMS(ctx, string(publicKey), originPhone)
-	if err != nil {
-		logg.DebugCtxf(ctx, "Failed to send address sms", "error", err)
-		return fmt.Errorf("Failed to send address sms: %v", err)
-	}
-	return nil
-}
--- a/menutraversal_test/group_test.json
+++ b/menutraversal_test/group_test.json
@ -1,67 +1,5 @@
 {
    "groups": [
-        {
-            "name": "main_my_vouchers_select_voucher_using_index",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "My vouchers\n1:Select voucher\n2:Voucher details\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
-                },
-                {
-                    "input": "",
-                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Enter PIN to confirm selection:\nSymbol: SRF\nBalance: 2.745987\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Success! SRF is now your active voucher.\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "main_my_vouchers_select_voucher_using_symbol",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "My vouchers\n1:Select voucher\n2:Voucher details\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Select number or symbol from your vouchers:\n1SRF\n0:Back\n99:Quit"
-                },
-                {
-                    "input": "SRF",
-                    "expectedContent": "Enter PIN to confirm selection:\nSymbol: SRF\nBalance: 2.745987\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "Success! SRF is now your active voucher.\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
        {
            "name": "my_account_change_pin",
            "steps": [
@ -71,7 +9,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "5",
@ -108,11 +46,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "2",
@ -120,7 +54,7 @@
                },
                {
                    "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
                },
                {
                    "input": "1",
@ -140,105 +74,6 @@
                }
            ]
        },
-        {
-            "name": "menu_my_account_reset_others_pin_with_unregistered_number",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Enter other's phone number:\n0:Back"
-                },
-                {
-                    "input": "0700000001",
-                    "expectedContent": "The number you have entered is either not registered with Sarafu or is invalid.\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Enter other's phone number:\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_reset_others_pin_with_registered_number",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "Enter other's phone number:\n0:Back"
-                },
-                {
-                    "input": "0700000000",
-                    "expectedContent": "{secondary_session_id} will get a PIN reset request.\nPlease enter your PIN to confirm:\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "1234",
-                    "expectedContent": "PIN reset request for {secondary_session_id} was successful\n0:Back\n9:Quit"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
-        {
-            "name": "menu_my_account_reset_others_pin_with_no_privileges",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "5",
-                    "expectedContent": "PIN Management\n1:Change PIN\n2:Reset other's PIN\n0:Back"
-                },
-                {
-                    "input": "2",
-                    "expectedContent": "You do not have privileges to perform this action\n\n9:Quit\n0:Back"
-                },
-                {
-                    "input": "0",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                }
-            ]
-        },
        {
            "name": "menu_my_account_check_my_balance",
            "steps": [
@ -248,7 +83,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "3",
@ -260,7 +95,7 @@
                },
                {
                    "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
                },
                {
                    "input": "1",
@ -268,7 +103,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "{balance}\n\n0:Back\n9:Quit"
+                    "expectedContent": "Balance: {balance}\n\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
@ -276,7 +111,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "0",
@ -293,7 +128,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "3",
@ -305,7 +140,7 @@
                },
                {
                    "input": "1235",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
+                    "expectedContent": "Incorrect PIN. You have: 2 remaining attempt(s).\n1:Retry\n9:Quit"
                },
                {
                    "input": "1",
@ -321,7 +156,7 @@
                },
                {
                    "input": "0",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "0",
@ -338,7 +173,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "1",
@ -395,7 +230,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "1",
@ -432,7 +267,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "1",
@ -442,10 +277,6 @@
                    "input": "3",
                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
                },
-                {
-                    "input": "",
-                    "expectedContent": "Select gender: \n1:Male\n2:Female\n3:Unspecified\n0:Back"
-                },
                {
                    "input": "1",
                    "expectedContent": "Please enter your PIN:"
@ -473,7 +304,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "1",
@ -510,7 +341,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "1",
@ -547,7 +378,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "1",
@ -584,7 +415,7 @@
                },
                {
                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "1",
@ -596,7 +427,7 @@
                },
                {
                    "input": "1234",
-                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\nYour alias: Not Provided\n\n0:Back\n9:Quit"
+                    "expectedContent": "My profile:\nName: foo bar\nGender: male\nAge: 80\nLocation: Kilifi\nYou provide: Bananas\n\n0:Back\n9:Quit"
                },
                {
                    "input": "0",
@ -607,47 +438,6 @@
                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
                }
            ]
-        },
-        {
-            "name": "menu_block_account_via_view_profile",
-            "steps": [
-                {
-                    "input": "",
-                    "expectedContent": "{balance}\n\n1:Send\n2:My Vouchers\n3:My Account\n4:Help\n9:Quit"
-                },
-                {
-                    "input": "3",
-                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "My profile\n1:Edit name\n2:Edit family name\n3:Edit gender\n4:Edit year of birth\n5:Edit location\n6:Edit offerings\n7:View profile\n0:Back"
-                },
-                {
-                    "input": "7",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1254",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1254",
-                    "expectedContent": "Incorrect PIN. You have: {attempts} remaining attempt(s).\n1:Retry\n9:Quit"
-                },
-                {
-                    "input": "1",
-                    "expectedContent": "Please enter your PIN:"
-                },
-                {
-                    "input": "1254",
-                    "expectedContent": "Your account has been locked. For help on how to unblock your account, contact support at: 0757628885"
-                }
-            ]
        }
    ]
 }
--- a/menutraversal_test/menu_traversal_test.go
+++ b/menutraversal_test/menu_traversal_test.go
@ -9,19 +9,18 @@ import (
 	"regexp"
 	"testing"

-	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/testutil"
-	"git.grassecon.net/grassrootseconomics/visedriver/testutil/driver"
 	"github.com/gofrs/uuid"
+	"git.defalsify.org/vise.git/logging"
+	"git.grassecon.net/grassrootseconomics/visedriver/testutil/driver"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/testutil"
 )

 var (
-	logg               = logging.NewVanilla().WithDomain("menutraversaltest")
-	testData           = driver.ReadData()
-	sessionID          string
-	src                = rand.NewSource(42)
-	g                  = rand.New(src)
-	secondarySessionId = "+254700000000"
+	logg = logging.NewVanilla().WithDomain("menutraversaltest")
+	testData  = driver.ReadData()
+	sessionID string
+	src       = rand.NewSource(42)
+	g         = rand.New(src)
 )

 var groupTestFile = flag.String("test-file", "group_test.json", "The test file to use for running the group tests")
@ -68,16 +67,6 @@ func extractMaxAmount(response []byte) string {
 	return ""
 }

-func extractRemainingAttempts(response []byte) string {
-	// Regex to match "You have: <number> remaining attempt(s)"
-	re := regexp.MustCompile(`(?m)You have:\s+(\d+)\s+remaining attempt\(s\)`)
-	match := re.FindSubmatch(response)
-	if match != nil {
-		return string(match[1]) // "<number>" of remaining attempts
-	}
-	return ""
-}
-
 // Extracts the send amount value from the engine response.
 func extractSendAmount(response []byte) string {
 	// Regex to match the pattern "will receive X.XX SYM from"
@ -98,43 +87,7 @@ func TestMain(m *testing.M) {
 }

 func TestAccountCreationSuccessful(t *testing.T) {
-	en, fn, eventChannel, _, _ := testutil.TestEngine(sessionID)
-	defer fn()
-	ctx := context.Background()
-	sessions := testData
-	for _, session := range sessions {
-		groups := driver.FilterGroupsByName(session.Groups, "account_creation_successful")
-		for _, group := range groups {
-			for i, step := range group.Steps {
-				logg.TraceCtxf(ctx, "executing step", "i", i, "step", step)
-				cont, err := en.Exec(ctx, []byte(step.Input))
-				if err != nil {
-					t.Fatalf("Test case '%s' failed at input '%s': %v", group.Name, step.Input, err)
-				}
-				if !cont {
-					break
-				}
-				w := bytes.NewBuffer(nil)
-				_, err = en.Flush(ctx, w)
-				if err != nil {
-					t.Fatalf("Test case '%s' failed during Flush: %v", group.Name, err)
-				}
-				b := w.Bytes()
-				match, err := step.MatchesExpectedContent(b)
-				if err != nil {
-					t.Fatalf("Error compiling regex for step '%s': %v", step.Input, err)
-				}
-				if !match {
-					t.Fatalf("expected:\n\t%s\ngot:\n\t%s\n", step.ExpectedContent, b)
-				}
-			}
-		}
-	}
-	<-eventChannel
-}
-
-func TestSecondaryAccount(t *testing.T) {
-	en, fn, eventChannel, _, _ := testutil.TestEngine(secondarySessionId)
+	en, fn, eventChannel := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -177,7 +130,7 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 		t.Fail()
 	}
 	edgeCaseSessionID := v.String()
-	en, fn, _, _, _ := testutil.TestEngine(edgeCaseSessionID)
+	en, fn, _ := testutil.TestEngine(edgeCaseSessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -213,7 +166,7 @@ func TestAccountRegistrationRejectTerms(t *testing.T) {
 }

 func TestMainMenuHelp(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -255,7 +208,7 @@ func TestMainMenuHelp(t *testing.T) {
 }

 func TestMainMenuQuit(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -296,7 +249,7 @@ func TestMainMenuQuit(t *testing.T) {
 }

 func TestMyAccount_MyAddress(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -340,7 +293,7 @@ func TestMyAccount_MyAddress(t *testing.T) {
 }

 func TestMainMenuSend(t *testing.T) {
-	en, fn, _, _, _ := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
 	sessions := testData
@ -391,12 +344,9 @@ func TestGroups(t *testing.T) {
 	if err != nil {
 		log.Fatalf("Failed to load test groups: %v", err)
 	}
-	en, fn, _, pe, flagParser := testutil.TestEngine(sessionID)
+	en, fn, _ := testutil.TestEngine(sessionID)
 	defer fn()
 	ctx := context.Background()
-
-	flag_admin_privilege, _ := flagParser.GetFlag("flag_admin_privilege")
-
 	// Create test cases from loaded groups
 	tests := driver.CreateTestCases(groups)
 	for _, tt := range tests {
@ -415,21 +365,9 @@ func TestGroups(t *testing.T) {
 			}
 			b := w.Bytes()
 			balance := extractBalance(b)
-			attempts := extractRemainingAttempts(b)
-
-			st := pe.GetState()
-
-			if st != nil {
-				st.SetFlag(flag_admin_privilege)
-				if tt.Name == "menu_my_account_reset_others_pin_with_no_privileges" {
-					st.ResetFlag(flag_admin_privilege)
-				}
-			}

 			expectedContent := []byte(tt.ExpectedContent)
 			expectedContent = bytes.Replace(expectedContent, []byte("{balance}"), []byte(balance), -1)
-			expectedContent = bytes.Replace(expectedContent, []byte("{attempts}"), []byte(attempts), -1)
-			expectedContent = bytes.Replace(expectedContent, []byte("{secondary_session_id}"), []byte(secondarySessionId), -1)

 			tt.ExpectedContent = string(expectedContent)

--- a/menutraversal_test/profile_edit_start_familyname.json
+++ b/menutraversal_test/profile_edit_start_familyname.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/profile_edit_start_firstname.json
+++ b/menutraversal_test/profile_edit_start_firstname.json
@ -9,7 +9,7 @@
                },
                {
                    "input": "3",
-                   "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                    "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                },
                {
                    "input": "1",
--- a/menutraversal_test/profile_edit_start_gender.json
+++ b/menutraversal_test/profile_edit_start_gender.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/profile_edit_start_location.json
+++ b/menutraversal_test/profile_edit_start_location.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/profile_edit_start_offerings.json
+++ b/menutraversal_test/profile_edit_start_offerings.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/profile_edit_start_yob.json
+++ b/menutraversal_test/profile_edit_start_yob.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/profile_edit_when_adjacent_item_set.json
+++ b/menutraversal_test/profile_edit_when_adjacent_item_set.json
@ -9,7 +9,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                    },
                    {
                        "input": "1",
--- a/menutraversal_test/test_setup.json
+++ b/menutraversal_test/test_setup.json
@ -116,7 +116,7 @@
                    },
                    {
                        "input": "3",
-                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n7:My Alias\n0:Back"
+                        "expectedContent": "My Account\n1:Profile\n2:Change language\n3:Check balances\n4:Check statement\n5:PIN options\n6:My Address\n0:Back"
                    },
                    {
                        "input": "6",
--- a/profile/profile.go
+++ b/profile/profile.go
@ -12,7 +12,7 @@ func (p *Profile) InsertOrShift(index int, value string) {
 		for len(p.ProfileItems) < index {
 			p.ProfileItems = append(p.ProfileItems, "0")
 		}
-		p.ProfileItems = append(p.ProfileItems, "0")
+		p.ProfileItems = append(p.ProfileItems, "0") 
 		p.ProfileItems[index] = value
 	}
 }
--- a/profile/profile_test.go
+++ b/profile/profile_test.go
@ -1,42 +0,0 @@
-package profile
-
-import (
-	"testing"
-
-	"github.com/alecthomas/assert/v2"
-	"github.com/stretchr/testify/require"
-)
-
-func TestInsertOrShift(t *testing.T) {
-	tests := []struct {
-		name     string
-		profile Profile
-		index   int
-		value   string
-		expected []string
-	}{
-		{
-			name:     "Insert within range",
-			profile:  Profile{ProfileItems: []string{"A", "B", "C"}, Max: 5},
-			index:    1,
-			value:    "X",
-			expected: []string{"A", "X"},
-		},
-		{
-			name:     "Insert beyond range",
-			profile:  Profile{ProfileItems: []string{"A"}, Max: 5},
-			index:    3,
-			value:    "Y",
-			expected: []string{"A", "0", "0", "Y"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			p := tt.profile
-			p.InsertOrShift(tt.index, tt.value)
-			require.NotNil(t, p.ProfileItems)
-			assert.Equal(t, tt.expected, p.ProfileItems)
-		})
-	}
-}
--- a/services/local.go
+++ b/services/local.go
@ -1,17 +1,16 @@
-//go:build !online
 // +build !online

 package services

 import (
-	"context"
 	"fmt"
+	"context"

-	devremote "git.grassecon.net/grassrootseconomics/sarafu-api/dev"
-	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
-	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
-	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
 	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	devremote "git.grassecon.net/grassrootseconomics/sarafu-api/dev"
+	"git.grassecon.net/grassrootseconomics/sarafu-api/remote"
+	apievent "git.grassecon.net/grassrootseconomics/sarafu-api/event"
+	"git.grassecon.net/grassrootseconomics/sarafu-vise/handlers/event"
 )

 type localEmitter struct {
--- a/services/registration/address.vis
+++ b/services/registration/address.vis
@ -1,4 +1,5 @@
 LOAD check_identifier 0
+RELOAD check_identifier
 MAP check_identifier
 MOUT back 0
 MOUT quit 9
--- a/services/registration/amount.vis
+++ b/services/registration/amount.vis
@ -1,12 +1,12 @@
 LOAD reset_transaction_amount 0
-LOAD max_amount 40
+LOAD max_amount 10
 RELOAD max_amount
 MAP max_amount
 MOUT back 0
 HALT
 LOAD validate_amount 64
 RELOAD validate_amount
-CATCH api_failure flag_api_call_error 1
+CATCH api_failure flag_api_call_error  1
 CATCH invalid_amount flag_invalid_amount 1
 INCMP _ 0
 LOAD get_recipient 0
--- a/services/registration/api_failure
+++ b/services/registration/api_failure
@ -1 +1 @@
-Your request failed. Please try again later.
+Failed to connect to the custodial service.Please try again.
--- a/services/registration/api_failure.vis
+++ b/services/registration/api_failure.vis
@ -1,7 +1,5 @@
-LOAD reset_api_call_failure 6
-RELOAD reset_api_call_failure
 MOUT retry 1
 MOUT quit 9
 HALT
-INCMP ^ 1
+INCMP _ 1
 INCMP quit 9
--- a/services/registration/api_failure_swa
+++ b/services/registration/api_failure_swa
@ -1 +0,0 @@
-Ombi lako halikufaulu. Tafadhali jaribu tena baadaye.
--- a/services/registration/authorize_reset_others_pin
+++ b/services/registration/authorize_reset_others_pin
@ -1,2 +0,0 @@
-{{.retrieve_blocked_number}} will get a PIN reset request.
-Please enter your PIN to confirm:
--- a/services/registration/authorize_reset_others_pin.vis
+++ b/services/registration/authorize_reset_others_pin.vis
@ -1,12 +0,0 @@
-LOAD retrieve_blocked_number 0
-RELOAD retrieve_blocked_number
-MAP retrieve_blocked_number
-MOUT back 0
-MOUT quit 9
-LOAD authorize_account 6
-HALT
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-INCMP _ 0
-INCMP quit 9
-INCMP pin_reset_result *
--- a/services/registration/authorize_reset_others_pin_swa
+++ b/services/registration/authorize_reset_others_pin_swa
@ -1,2 +0,0 @@
-{{.retrieve_blocked_number}} atapokea ombi la kuweka upya PIN.
-Tafadhali weka PIN yako kudhibitisha:
--- a/services/registration/check_statement.vis
+++ b/services/registration/check_statement.vis
@ -1,6 +1,5 @@
 LOAD check_transactions 0
 RELOAD check_transactions
-CATCH api_failure flag_api_call_error 1
 CATCH no_transfers flag_no_transfers 1
 LOAD authorize_account 6
 MOUT back 0
--- a/services/registration/community_balance.vis
+++ b/services/registration/community_balance.vis
@ -1,6 +1,6 @@
 LOAD reset_incorrect 6
 LOAD fetch_community_balance 0
-CATCH api_failure flag_api_call_error 1
+CATCH api_failure  flag_api_call_error  1
 MAP fetch_community_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
--- a/services/registration/confirm_create_pin.vis
+++ b/services/registration/confirm_create_pin.vis
@ -1,7 +1,4 @@
-MOUT back 0
+LOAD save_temporary_pin 6
 HALT
-INCMP _ 0
 LOAD verify_create_pin 8
-RELOAD verify_create_pin
-CATCH pin_mismatch flag_pin_mismatch 1
 INCMP account_creation *
--- a/services/registration/confirm_new_alias
+++ b/services/registration/confirm_new_alias
@ -1,2 +0,0 @@
-Your full alias will be: {{.get_suggested_alias}}
-Please enter your PIN to confirm: 
--- a/services/registration/confirm_new_alias.vis
+++ b/services/registration/confirm_new_alias.vis
@ -1,12 +0,0 @@
-LOAD reset_invalid_pin 6
-RELOAD reset_invalid_pin
-LOAD get_suggested_alias 0
-RELOAD get_suggested_alias
-MAP get_suggested_alias
-MOUT back 0
-HALT
-INCMP _ 0
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH invalid_pin flag_invalid_pin 1
-CATCH update_alias flag_allow_update 1
--- a/services/registration/confirm_new_alias_swa
+++ b/services/registration/confirm_new_alias_swa
@ -1,2 +0,0 @@
-Lakabu yako kamili itakuwa: {{.get_suggested_alias}}
-Tafadhali weka PIN yako ili kuthibitisha:
--- a/services/registration/confirm_others_new_pin
+++ b/services/registration/confirm_others_new_pin
@ -0,0 +1 @@
+Please confirm new PIN  for:{{.retrieve_blocked_number}}
--- a/services/registration/confirm_others_new_pin.vis
+++ b/services/registration/confirm_others_new_pin.vis
@ -0,0 +1,14 @@
+CATCH pin_entry flag_incorrect_pin 1
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+CATCH invalid_others_pin flag_valid_pin 0
+CATCH pin_reset_result flag_account_authorized 1
+LOAD save_others_temporary_pin 6
+RELOAD save_others_temporary_pin
+MOUT back 0
+HALT 
+INCMP _ 0
+LOAD check_pin_mismatch 0
+RELOAD check_pin_mismatch
+CATCH others_pin_mismatch flag_pin_mismatch 1
+INCMP pin_entry *
--- a/services/registration/confirm_others_new_pin_swa
+++ b/services/registration/confirm_others_new_pin_swa
@ -0,0 +1 @@
+Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}
--- a/services/registration/confirm_pin_change.vis
+++ b/services/registration/confirm_pin_change.vis
@ -1,7 +1,5 @@
+CATCH invalid_pin flag_valid_pin 0
 MOUT back 0
 HALT
 INCMP _ 0
-LOAD confirm_pin_change 0
-RELOAD confirm_pin_change
-CATCH pin_mismatch flag_pin_mismatch 1
-INCMP pin_reset_success *
+INCMP * pin_reset_success
--- a/services/registration/create_pin.vis
+++ b/services/registration/create_pin.vis
@ -2,8 +2,8 @@ LOAD create_account 0
 CATCH account_creation_failed flag_account_creation_failed 1
 MOUT exit 0
 HALT
-INCMP quit 0
 LOAD save_temporary_pin 6
 RELOAD save_temporary_pin
-CATCH invalid_pin flag_invalid_pin 1
+CATCH . flag_incorrect_pin 1
+INCMP quit 0
 INCMP confirm_create_pin *
--- a/services/registration/create_pin_mismatch
+++ b/services/registration/create_pin_mismatch
--- a/services/registration/create_pin_mismatch.vis
+++ b/services/registration/create_pin_mismatch.vis
@ -1,6 +1,5 @@
-MAP swap_max_limit
 MOUT retry 1
 MOUT quit 9
 HALT
-INCMP _ 1
+INCMP confirm_create_pin 1
 INCMP quit 9
--- a/services/registration/create_pin_mismatch_swa
+++ b/services/registration/create_pin_mismatch_swa
--- a/services/registration/enter_other_number.vis
+++ b/services/registration/enter_other_number.vis
@ -1,10 +1,7 @@
-CATCH no_admin_privilege flag_admin_privilege 0
+CATCH no_admin_privilege flag_admin_privilege  0
 LOAD reset_account_authorized 0
 RELOAD reset_account_authorized
 MOUT back 0
 HALT
 INCMP _ 0
-LOAD validate_blocked_number 6
-RELOAD validate_blocked_number
-CATCH unregistered_number flag_unregistered_number 1
-INCMP authorize_reset_others_pin *
+INCMP enter_others_new_pin *
--- a/services/registration/enter_others_new_pin
+++ b/services/registration/enter_others_new_pin
@ -0,0 +1 @@
+Please enter new PIN for: {{.retrieve_blocked_number}}
--- a/services/registration/enter_others_new_pin.vis
+++ b/services/registration/enter_others_new_pin.vis
@ -0,0 +1,12 @@
+LOAD validate_blocked_number 6
+RELOAD validate_blocked_number
+CATCH unregistered_number flag_unregistered_number 1
+LOAD retrieve_blocked_number 0
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+MOUT back 0
+HALT 
+LOAD verify_new_pin 6
+RELOAD verify_new_pin
+INCMP _ 0
+INCMP * confirm_others_new_pin
--- a/services/registration/enter_others_new_pin_swa
+++ b/services/registration/enter_others_new_pin_swa
@ -0,0 +1 @@
+Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}
--- a/services/registration/incorrect_pin.vis
+++ b/services/registration/incorrect_pin.vis
@ -7,4 +7,3 @@ MOUT quit 9
 HALT
 INCMP _ 1
 INCMP quit 9
-INCMP . *
--- a/services/registration/invalid_others_pin
+++ b/services/registration/invalid_others_pin
@ -0,0 +1 @@
+The PIN you have entered is invalid.Please try a 4 digit number instead.
--- a/services/registration/invalid_others_pin.vis
+++ b/services/registration/invalid_others_pin.vis
@ -0,0 +1,5 @@
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP enter_others_new_pin 1
+INCMP quit 9
--- a/services/registration/invalid_pin
+++ b/services/registration/invalid_pin
@ -1 +1 @@
-The PIN you entered is invalid. The PIN must be a 4 digit number.
+The PIN you entered is invalid.The PIN must be different from your current PIN.For help call +254757628885
--- a/services/registration/invalid_pin.vis
+++ b/services/registration/invalid_pin.vis
@ -1,8 +1,3 @@
-LOAD reset_invalid_pin 6
-RELOAD reset_invalid_pin
-MOUT retry 1
-MOUT quit 9
+MOUT back 0
 HALT
-INCMP _ 1
-INCMP quit 9
-INCMP . *
+INCMP _ 0
--- a/services/registration/invalid_pin_swa
+++ b/services/registration/invalid_pin_swa
@ -1 +1 @@
-PIN uliyoweka si sahihi. PIN lazima iwe nambari 4.
+PIN mpya na udhibitisho wa PIN mpya hazilingani.Tafadhali jaribu tena.Kwa usaidizi piga simu +254757628885.
--- a/services/registration/locale/swa/default.po
+++ b/services/registration/locale/swa/default.po
@ -30,12 +30,3 @@ msgstr "Salio la Kikundi: 0.00"

 msgid "Symbol: %s\nBalance: %s"
 msgstr "Sarafu: %s\nSalio: %s"
-
-msgid "Your request has been sent. You will receive an SMS when your %s %s has been swapped for %s."
-msgstr "Ombi lako limetumwa. Utapokea SMS wakati %s %s yako itakapobadilishwa kuwa %s."
-
-msgid "%s balance: %s\n"
-msgstr "%s salio: %s\n"
-
-msgid "%s is not in %s. Please update your voucher and try again."
-msgstr "%s haipo kwenye %s. Tafadhali badilisha sarafu yako na ujaribu tena."
--- a/services/registration/low_swap_amount
+++ b/services/registration/low_swap_amount
@ -1 +0,0 @@
-Available amount {{.swap_max_limit}} is too low, please try again:
--- a/services/registration/low_swap_amount_swa
+++ b/services/registration/low_swap_amount_swa
@ -1 +0,0 @@
-Kiasi kinachopatikana {{.swap_max_limit}} ni cha chini sana, tafadhali jaribu tena:
--- a/services/registration/main.vis
+++ b/services/registration/main.vis
@ -1,23 +1,20 @@
-LOAD clear_temporary_value 2
-RELOAD clear_temporary_value
-LOAD manage_vouchers 160
-RELOAD manage_vouchers
-CATCH  api_failure flag_api_call_error 1
+LOAD set_default_voucher 8
+RELOAD set_default_voucher
+LOAD check_vouchers 10
+RELOAD check_vouchers
 LOAD check_balance 128
 RELOAD check_balance
 CATCH api_failure flag_api_call_error 1
 MAP check_balance
 MOUT send 1
-MOUT swap 2
-MOUT vouchers 3
-MOUT account 4
-MOUT help 5
+MOUT vouchers 2
+MOUT account 3
+MOUT help 4
 MOUT quit 9
 HALT
 INCMP send 1
-INCMP swap_to_list 2
-INCMP my_vouchers 3
-INCMP my_account 4
-INCMP help 5
+INCMP my_vouchers 2
+INCMP my_account 3
+INCMP help 4
 INCMP quit 9
 INCMP . *
--- a/services/registration/missing_voucher
+++ b/services/registration/missing_voucher
@ -1 +0,0 @@
-{{.swap_to_list}}
--- a/services/registration/missing_voucher.vis
+++ b/services/registration/missing_voucher.vis
@ -1,6 +0,0 @@
-MAP swap_to_list
-MOUT back 0
-MOUT quit 9
-HALT
-INCMP ^ 0
-INCMP quit 9
--- a/services/registration/missing_voucher_swa
+++ b/services/registration/missing_voucher_swa
@ -1 +0,0 @@
-{{.swap_to_list}}
--- a/services/registration/my_account.vis
+++ b/services/registration/my_account.vis
@ -1,4 +1,3 @@
-LOAD authorize_account 16
 LOAD reset_allow_update 0
 MOUT profile 1
 MOUT change_language 2
@ -6,15 +5,13 @@ MOUT check_balance 3
 MOUT check_statement 4
 MOUT pin_options 5
 MOUT my_address 6
-MOUT my_account_alias 7
 MOUT back 0
 HALT
-INCMP ^ 0
+INCMP main 0
 INCMP edit_profile 1
 INCMP change_language 2
 INCMP balances 3
 INCMP check_statement 4
 INCMP pin_management 5
 INCMP address 6
-INCMP my_account_alias 7
 INCMP . *
--- a/services/registration/my_account_alias
+++ b/services/registration/my_account_alias
@ -1,2 +0,0 @@
-Current alias: {{.get_current_profile_info}}
-Enter your preferred alias:
--- a/services/registration/my_account_alias.vis
+++ b/services/registration/my_account_alias.vis
@ -1,9 +0,0 @@
-LOAD get_current_profile_info 0
-MAP get_current_profile_info
-MOUT back 0
-HALT 
-INCMP _ 0
-LOAD request_custom_alias 0
-RELOAD request_custom_alias
-CATCH api_failure flag_api_call_error 1
-INCMP confirm_new_alias *
--- a/services/registration/my_account_alias_menu
+++ b/services/registration/my_account_alias_menu
@ -1 +0,0 @@
-My Alias
--- a/services/registration/my_account_alias_menu_swa
+++ b/services/registration/my_account_alias_menu_swa
@ -1 +0,0 @@
-Lakabu yangu
--- a/services/registration/my_account_alias_swa
+++ b/services/registration/my_account_alias_swa
@ -1,2 +0,0 @@
-Lakabu ya sasa: {{.get_current_profile_info}}
-Weka lakabu unalopendelea:
--- a/services/registration/my_balance.vis
+++ b/services/registration/my_balance.vis
@ -1,6 +1,6 @@
 LOAD reset_incorrect 6
 LOAD check_balance 0
-CATCH api_failure flag_api_call_error 1
+CATCH api_failure  flag_api_call_error  1
 MAP check_balance
 CATCH incorrect_pin flag_incorrect_pin 1
 CATCH pin_entry flag_account_authorized 0
--- a/services/registration/new_pin.vis
+++ b/services/registration/new_pin.vis
@ -1,6 +1,13 @@
+LOAD authorize_account 12
+RELOAD authorize_account
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH old_pin flag_allow_update 0
 MOUT back 0
 HALT
 INCMP _ 0
+LOAD save_temporary_pin 6
+LOAD verify_new_pin 0
 RELOAD save_temporary_pin
-CATCH invalid_pin flag_invalid_pin 1
-INCMP confirm_pin_change *
+RELOAD verify_new_pin
+INCMP * confirm_pin_change
+
--- a/services/registration/no_admin_privilege.vis
+++ b/services/registration/no_admin_privilege.vis
@ -1,5 +1,5 @@
 MOUT quit 9
 MOUT back 0
 HALT
-INCMP ^ 0
+INCMP pin_management 0
 INCMP quit 9
--- a/services/registration/old_pin.vis
+++ b/services/registration/old_pin.vis
@ -1,8 +1,7 @@
-RELOAD reset_incorrect
+LOAD reset_allow_update 0
 MOUT back 0
 HALT
+RELOAD reset_allow_update
 INCMP _ 0
-RELOAD authorize_account
-CATCH incorrect_pin flag_incorrect_pin 1
-CATCH invalid_pin flag_invalid_pin 1
 INCMP new_pin *
+
--- a/services/registration/others_pin_mismatch
+++ b/services/registration/others_pin_mismatch
@ -0,0 +1 @@
+The PIN you have entered is not a match
--- a/services/registration/others_pin_mismatch.vis
+++ b/services/registration/others_pin_mismatch.vis
@ -3,4 +3,3 @@ MOUT quit 9
 HALT
 INCMP _ 1
 INCMP quit 9
-INCMP . *
--- a/services/registration/others_pin_mismatch_swa
+++ b/services/registration/others_pin_mismatch_swa
@ -0,0 +1 @@
+PIN uliyoweka hailingani.Jaribu tena.
--- a/services/registration/pin_management.vis
+++ b/services/registration/pin_management.vis
@ -1,14 +1,8 @@
-LOAD set_back 6
-LOAD authorize_account 16
-LOAD reset_allow_update 4
-LOAD save_temporary_pin 1
-LOAD reset_incorrect 0
-LOAD reset_invalid_pin 6
 MOUT change_pin 1
 MOUT reset_pin 2
 MOUT back 0
 HALT
-INCMP _ 0
-INCMP old_pin 1
+INCMP my_account 0
+INCMP old_pin  1
 INCMP enter_other_number 2
 INCMP . *
--- a/services/registration/pin_reset_mismatch
+++ b/services/registration/pin_reset_mismatch
@ -0,0 +1 @@
+The PIN is not a match. Try again
--- a/services/registration/pin_reset_mismatch.vis
+++ b/services/registration/pin_reset_mismatch.vis
@ -0,0 +1,6 @@
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP confirm_pin_change 1
+INCMP quit 9
+
--- a/services/registration/pin_reset_mismatch_swa
+++ b/services/registration/pin_reset_mismatch_swa
@ -0,0 +1 @@
+PIN uliyoweka hailingani.Jaribu tena.
--- a/services/registration/pin_reset_result.vis
+++ b/services/registration/pin_reset_result.vis
@ -1,9 +1,8 @@
-CATCH _ flag_account_authorized 0
 LOAD retrieve_blocked_number 0
 MAP retrieve_blocked_number
 LOAD reset_others_pin 6
 MOUT back 0
 MOUT quit 9
 HALT
-INCMP ^ 0
-INCMP quit 9
+INCMP pin_management 0
+INCMP quit  9
--- a/services/registration/pin_reset_success.vis
+++ b/services/registration/pin_reset_success.vis
@ -1,6 +1,8 @@
+LOAD confirm_pin_change 0
+RELOAD confirm_pin_change
+CATCH pin_reset_mismatch  flag_pin_mismatch 1
 MOUT back 0
 MOUT quit 9
 HALT
-INCMP ^ 0
+INCMP main 0
 INCMP quit 9
-INCMP . *
--- a/services/registration/pp.csv
+++ b/services/registration/pp.csv
@ -9,7 +9,7 @@ flag,flag_account_authorized,15,this is set to allow a user access guarded nodes
 flag,flag_invalid_recipient,16,this is set when the transaction recipient is invalid
 flag,flag_invalid_recipient_with_invite,17,this is set when the transaction recipient is valid but not on the platform
 flag,flag_invalid_amount,18,this is set when the given transaction amount is invalid
-flag,flag_incorrect_pin,19,this is set when the provided PIN does not match the current account's PIN
+flag,flag_incorrect_pin,19,this is set when the provided PIN is invalid or does not match the current account's PIN
 flag,flag_valid_pin,20,this is set when the given PIN is valid
 flag,flag_allow_update,21,this is set to allow a user to update their profile data
 flag,flag_single_edit,22,this is set to allow a user to edit a single profile item such as year of birth
@ -29,9 +29,4 @@ flag,flag_location_set,35,this is set when the location of the profile is set
 flag,flag_offerings_set,36,this is set when the offerings of the profile is set
 flag,flag_back_set,37,this is set when it is a back navigation
 flag,flag_account_blocked,38,this is set when an account has been blocked after the allowed incorrect PIN attempts have been exceeded
-flag,flag_invalid_pin,39,this is set when the given PIN is invalid(is  less than or more than 4 digits)
-flag,flag_alias_set,40,this is set when an account alias has been assigned to a user
-flag,flag_account_pin_reset,41,this is set on an account when an admin triggers a PIN reset for themflag,flag_incorrect_pool,39,this is set when the user selects an invalid pool
-flag,flag_incorrect_pool,42,this is set when the user selects an invalid pool
-flag,flag_low_swap_amount,43,this is set when the swap max limit is less than 0.1

--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				`Ombi lako halikufaulu. Tafadhali jaribu tena baadaye.`
				`@ -0,0 +1 @@`
				`Please confirm new PIN for:{{.retrieve_blocked_number}}`
				`@ -0,0 +1 @@`
				`Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}`
				`@ -0,0 +1 @@`
				`Please enter new PIN for: {{.retrieve_blocked_number}}`
				`@ -0,0 +1 @@`
				`Tafadhali weka PIN mpya ya: {{.retrieve_blocked_number}}`
				`@ -0,0 +1 @@`
				`The PIN you have entered is invalid.Please try a 4 digit number instead.`
				`@ -1 +0,0 @@`
				`Available amount {{.swap_max_limit}} is too low, please try again:`
				`@ -1 +0,0 @@`
				`Kiasi kinachopatikana {{.swap_max_limit}} ni cha chini sana, tafadhali jaribu tena:`