diff --git a/package/migrator/migrator.sh b/package/migrator/migrator.sh
index 799256a..203dca8 100644
--- a/package/migrator/migrator.sh
+++ b/package/migrator/migrator.sh
@@ -12,7 +12,7 @@ REMAINING_ARS=
 while [ $# -gt 0 ]; do
   log debug "$1"
   case $1 in
-    migrate|create|fetch)
+    migrate|create|fetch|list)
       [ "${SUBCOMMAND+x}" ] && { printf 'ambiguous subcommand, decide %s or %s\n' "$SUBCOMMAND" "$1"; exit 1; }
       SUBCOMMAND=$1
       shift
@@ -59,7 +59,69 @@ help() {
   echo help
 }
 
+migrate_down() {
+  DOWN_NUMBER=1
+  while [ $# -gt 0 ]; do
+    case $1 in
+      --*|-*)
+        printf 'migrate argument %s does not exists' "$1"
+        exit 1
+      ;;
+      ''|*[!0-9]*)
+	log error "down argument not a number";
+	exit 1;
+      ;;
+      *)
+	DOWN_NUMBER=$2
+	shift 2;
+      ;;
+    esac
+  done
+
+  : "$DOWN_NUMBER"
+}
+
+migrate_up() {
+  UP_NUMBER=1
+  while [ $# -gt 0 ]; do
+    case $1 in
+      --*|-*)
+        printf 'migrate argument %s does not exists' "$1"
+        exit 1
+      ;;
+      ''|*[!0-9]*)
+	log error "up argument not a number";
+	exit 1;
+      ;;
+      *)
+	UP_NUMBER=$2
+	shift 2;
+      ;;
+    esac
+  done
+
+  : "$UP_NUMBER"
+  #ls "$MIGRATION_DIR" -1 | sort
+}
+
+migrate_to() {
+  while [ $# -gt 0 ]; do
+    case $1 in
+      --*|-*)
+        printf 'migrate argument %s does not exists' "$1"
+        exit 1
+      ;;
+      *)
+	MIGRATION_NAME=
+      ;;
+    esac
+  done
+
+  [ "${MIGRATION_NAME+x}" ] || { log error "no migration name specified"; exit 1; }
+}
+
 migrate() {
+  local fs_migrations db_migrations db_migration fs_migration psql_args var #target_migration
   while [ $# -gt 0 ]; do
     case $1 in
       up|down|to)
@@ -78,25 +140,27 @@ migrate() {
 	VARIABLE_LIST="${VARIABLE_LIST:+$VARIABLE_LIST }$2"
         shift 2
       ;;
-      --*|-*)
-        printf 'migrate argument %s does not exists' "$1"
-        exit 1
-      ;;
-      *)
-        printf 'migrate subcommand %s does not exists' "$1"
-        exit 1
-      ;;
+      --*|-*) REMAINING_ARS="$REMAINING_ARS $(quote "$1")"; shift ;;              # unknown global -> pass through
+      *) REMAINING_ARS="$REMAINING_ARS $(quote "$1")"; shift ;;
+      #--*|-*)
+      #  printf 'migrate argument %s does not exists' "$1"
+      #  exit 1
+      #;;
+      #*)
+      #  printf 'migrate subcommand %s does not exists' "$1"
+      #  exit 1
+      #;;
     esac
   done
 
-  # Get the list of new migrations from disk
+  init
+
   fs_migrations=$(
     find "$MIGRATION_DIR" -maxdepth 1 -type f -name '*.sql' \
       | sort \
       | xargs -n1 basename
   )
 
-  # Get the list of already applied migrations from DB
   db_migrations=$(
     psql -Atqc "SELECT name FROM hectic.migration ORDER BY name ASC" \
       | awk NF
@@ -106,7 +170,7 @@ migrate() {
   # (meaning all DB-applied migration filenames should appear in the same order at the start).
   i=0
   for db_migration in $db_migrations; do
-    fs_migration=$(echo "$fs_migrations" | sed -n "$((i+1))p")
+    fs_migration=$(printf '%s' "$fs_migrations" | sed -n "$((i+1))p")
     if [ -z "$fs_migration" ] || [ "$fs_migration" != "$db_migration" ]; then
       if [ -z "$FORCE" ]; then
         log error "unrelated migration tree detected. Use --force to proceed."
@@ -118,6 +182,34 @@ migrate() {
     fi
     i=$((i+1))
   done
+
+  eval "set -- $REMAINING_ARS"
+  #target_migration="$("migrate_$MIGRATE_SUBCOMMAND" "$@")"
+
+  printf '%s\n' "$fs_migrations" | while IFS= read -r fs_migration; do
+    # skip already applied migrations
+    printf '%s' "$db_migrations" | grep -qxF "$fs_migration" && continue
+
+    psql_args="-d $DB_URL"
+    for var in $VARIABLE_LIST; do
+        psql_args="$psql_args -v $var"
+    done
+
+    escaped_name=$(printf "%s" "$fs_migration" | sed "s/'/''/g")
+    escaped_path=$(printf "%s/%s" "$MIGRATION_DIR" "$fs_migration" | sed "s/'/''/g")
+
+    # shellcheck disable=SC2086
+    if ! psql $psql_args <<SQL
+BEGIN;
+\i '$escaped_path';
+INSERT INTO hectic.migration (name) VALUES ('$escaped_name');
+COMMIT;
+SQL
+    then
+      log error "Migration failed: ${WHITE}$fs_migration${NC}"
+      return 3
+    fi
+  done
 }
 
 create() {
@@ -165,6 +257,10 @@ fetch() {
   done
 }
 
+list() {
+  ls "$MIGRATION_DIR" -1
+}
+
 generate_word() {
   C="b c d f g h j k l m n p r s t v w z"
   V="a e i o u"
diff --git a/test/package/migrator/default.nix b/test/package/migrator/default.nix
index 11020a8..c3b2bf9 100644
--- a/test/package/migrator/default.nix
+++ b/test/package/migrator/default.nix
@@ -40,5 +40,9 @@
     ${builtins.readFile self.legacyPackages.${system}.helpers.posix-shell.log}
     test=${testDrv}
     ${builtins.readFile ./lauch.sh}
+
+    # success marker for Nix
+    # shellcheck disable=SC2154
+    mkdir -p "$out"
   '';
 in lib.mapAttrs (name: drv: mkPgTest name drv) testDrvs
diff --git a/test/package/migrator/test/migrate-up/migration/20251104192425-add-info-to-profile.sql b/test/package/migrator/test/migrate-up/migration/20251104192425-add-info-to-profile.sql
new file mode 100644
index 0000000..818abfc
--- /dev/null
+++ b/test/package/migrator/test/migrate-up/migration/20251104192425-add-info-to-profile.sql
@@ -0,0 +1 @@
+ALTER TABLE profile ADD COLUMN info TEXT;
diff --git a/test/package/migrator/test/migrate-up/run.sh b/test/package/migrator/test/migrate-up/run.sh
new file mode 100644
index 0000000..f847ef0
--- /dev/null
+++ b/test/package/migrator/test/migrate-up/run.sh
@@ -0,0 +1,6 @@
+psql "$DATABASE_URL" 'CREATE TABLE profile (
+  id       INTEGER,
+  username TEXT
+)'
+
+#migrator migrate to 20251104192425-add-info-to-profile
diff --git a/test/package/migrator/test/migrations-list/migration/20251004192425-some-changes.sql b/test/package/migrator/test/migrations-list/migration/20251004192425-some-changes.sql
new file mode 100644
index 0000000..e95cb5d
--- /dev/null
+++ b/test/package/migrator/test/migrations-list/migration/20251004192425-some-changes.sql
@@ -0,0 +1 @@
+-- nothing
diff --git a/test/package/migrator/test/migrations-list/migration/20251004292448-some-changes.sql b/test/package/migrator/test/migrations-list/migration/20251004292448-some-changes.sql
new file mode 100644
index 0000000..e95cb5d
--- /dev/null
+++ b/test/package/migrator/test/migrations-list/migration/20251004292448-some-changes.sql
@@ -0,0 +1 @@
+-- nothing
diff --git a/test/package/migrator/test/migrations-list/migration/20251104172425-third-migration.sql b/test/package/migrator/test/migrations-list/migration/20251104172425-third-migration.sql
new file mode 100644
index 0000000..e95cb5d
--- /dev/null
+++ b/test/package/migrator/test/migrations-list/migration/20251104172425-third-migration.sql
@@ -0,0 +1 @@
+-- nothing
diff --git a/test/package/migrator/test/migrations-list/migration/20251104192427-an-other-one.sql b/test/package/migrator/test/migrations-list/migration/20251104192427-an-other-one.sql
new file mode 100644
index 0000000..e95cb5d
--- /dev/null
+++ b/test/package/migrator/test/migrations-list/migration/20251104192427-an-other-one.sql
@@ -0,0 +1 @@
+-- nothing
diff --git a/test/package/migrator/test/migrations-list/migration/20251104292469-almoust-last.sql b/test/package/migrator/test/migrations-list/migration/20251104292469-almoust-last.sql
new file mode 100644
index 0000000..e95cb5d
--- /dev/null
+++ b/test/package/migrator/test/migrations-list/migration/20251104292469-almoust-last.sql
@@ -0,0 +1 @@
+-- nothing
diff --git a/test/package/migrator/test/migrations-list/migration/20251204152446-very-last.sql b/test/package/migrator/test/migrations-list/migration/20251204152446-very-last.sql
new file mode 100644
index 0000000..e95cb5d
--- /dev/null
+++ b/test/package/migrator/test/migrations-list/migration/20251204152446-very-last.sql
@@ -0,0 +1 @@
+-- nothing
diff --git a/test/package/migrator/test/migrations-list/run.sh b/test/package/migrator/test/migrations-list/run.sh
new file mode 100644
index 0000000..9aae918
--- /dev/null
+++ b/test/package/migrator/test/migrations-list/run.sh
@@ -0,0 +1 @@
+migrator list