diff --git a/ts/node/migration/helpers/index.ts b/ts/node/migration/helpers/index.ts
new file mode 100644
index 000000000..fe2e15c94
--- /dev/null
+++ b/ts/node/migration/helpers/index.ts
@@ -0,0 +1,21 @@
+/* eslint-disable max-len */
+/*
+
+When doing migrations that related to libsession we cannot share useful functions between migrations because the typings for libsession can change between versions.
+
+To fix this, we now put these "helper" functions in a migration number specific file that can be trusted to have the correct typings and values for that version of libsession.
+
+In order for this to work, any properties on an object type exported from libsession need to be optional. This is because we cannot guarantee that the value will exist on the object in the version of libsession that we are migrating from.
+
+Any helper functions that are exported from a helper file must have run checkTargetMigration(version, targetVersion); on the first line to confirm that the helper function is being reference within the correct migration. It will throw an error otherwise.
+
+*/
+/* eslint-enable max-len */
+
+import { V31 } from './v31';
+
+const MIGRATION_HELPERS = {
+  V31,
+};
+
+export default MIGRATION_HELPERS;
diff --git a/ts/node/migration/helpers/v31.ts b/ts/node/migration/helpers/v31.ts
new file mode 100644
index 000000000..1f164a9a0
--- /dev/null
+++ b/ts/node/migration/helpers/v31.ts
@@ -0,0 +1,377 @@
+/* eslint-disable no-unused-expressions */
+import * as BetterSqlite3 from '@signalapp/better-sqlite3';
+import {
+  ContactInfoSet,
+  ContactsConfigWrapperNode,
+  ConvoInfoVolatileWrapperNode,
+  LegacyGroupInfo,
+  LegacyGroupMemberInfo,
+  UserGroupsWrapperNode,
+} from 'libsession_util_nodejs';
+import { isEmpty, isEqual, isFinite, isNumber } from 'lodash';
+import { from_hex } from 'libsodium-wrappers-sumo';
+import { MESSAGES_TABLE, toSqliteBoolean } from '../../database_utility';
+import {
+  CONVERSATION_PRIORITIES,
+  ConversationAttributes,
+} from '../../../models/conversationAttributes';
+import { maybeArrayJSONtoArray } from '../../../types/sqlSharedTypes';
+import { checkTargetMigration, hasDebugEnvVariable } from '../utils';
+import { sqlNode } from '../../sql';
+import { HexKeyPair } from '../../../receiver/keypairs';
+import { fromHexToArray } from '../../../session/utils/String';
+
+const targetVersion = 31;
+
+/**
+ * This function returns a contactInfo for the wrapper to understand from the DB values.
+ * Created in this file so we can reuse it during the migration (node side), and from the renderer side
+ */
+function getContactInfoFromDBValues({
+  id,
+  dbApproved,
+  dbApprovedMe,
+  dbBlocked,
+  dbName,
+  dbNickname,
+  priority,
+  dbProfileUrl,
+  dbProfileKey,
+  dbCreatedAtSeconds,
+}: {
+  id: string;
+  dbApproved: boolean;
+  dbApprovedMe: boolean;
+  dbBlocked: boolean;
+  dbNickname: string | undefined;
+  dbName: string | undefined;
+  priority: number;
+  dbProfileUrl: string | undefined;
+  dbProfileKey: string | undefined;
+  dbCreatedAtSeconds: number;
+}): ContactInfoSet {
+  const wrapperContact: ContactInfoSet = {
+    id,
+    approved: !!dbApproved,
+    approvedMe: !!dbApprovedMe,
+    blocked: !!dbBlocked,
+    priority,
+    nickname: dbNickname,
+    name: dbName,
+    createdAtSeconds: dbCreatedAtSeconds,
+  };
+
+  if (
+    wrapperContact.profilePicture?.url !== dbProfileUrl ||
+    !isEqual(wrapperContact.profilePicture?.key, dbProfileKey)
+  ) {
+    wrapperContact.profilePicture = {
+      url: dbProfileUrl || null,
+      key: dbProfileKey && !isEmpty(dbProfileKey) ? fromHexToArray(dbProfileKey) : null,
+    };
+  }
+
+  return wrapperContact;
+}
+
+function insertContactIntoContactWrapper(
+  contact: any,
+  blockedNumbers: Array<string>,
+  contactsConfigWrapper: ContactsConfigWrapperNode | null, // set this to null to only insert into the convo volatile wrapper (i.e. for ourConvo case)
+  volatileConfigWrapper: ConvoInfoVolatileWrapperNode,
+  db: BetterSqlite3.Database,
+  version: number
+) {
+  checkTargetMigration(version, targetVersion);
+
+  if (contactsConfigWrapper !== null) {
+    const dbApproved = !!contact.isApproved || false;
+    const dbApprovedMe = !!contact.didApproveMe || false;
+    const dbBlocked = blockedNumbers.includes(contact.id);
+    const priority = contact.priority || CONVERSATION_PRIORITIES.default;
+
+    const wrapperContact = getContactInfoFromDBValues({
+      id: contact.id,
+      dbApproved,
+      dbApprovedMe,
+      dbBlocked,
+      dbName: contact.displayNameInProfile || undefined,
+      dbNickname: contact.nickname || undefined,
+      dbProfileKey: contact.profileKey || undefined,
+      dbProfileUrl: contact.avatarPointer || undefined,
+      priority,
+      dbCreatedAtSeconds: Math.floor((contact.active_at || Date.now()) / 1000),
+    });
+
+    try {
+      hasDebugEnvVariable && console.info('Inserting contact into wrapper: ', wrapperContact);
+      contactsConfigWrapper.set(wrapperContact);
+    } catch (e) {
+      console.error(
+        `contactsConfigWrapper.set during migration failed with ${e.message} for id: ${contact.id}`
+      );
+      // the wrapper did not like something. Try again with just the boolean fields as it's most likely the issue is with one of the strings (which could be recovered)
+      try {
+        hasDebugEnvVariable && console.info('Inserting edited contact into wrapper: ', contact.id);
+        contactsConfigWrapper.set(
+          getContactInfoFromDBValues({
+            id: contact.id,
+            dbApproved,
+            dbApprovedMe,
+            dbBlocked,
+            dbName: undefined,
+            dbNickname: undefined,
+            dbProfileKey: undefined,
+            dbProfileUrl: undefined,
+            priority: CONVERSATION_PRIORITIES.default,
+            dbCreatedAtSeconds: Math.floor(Date.now() / 1000),
+          })
+        );
+      } catch (err2) {
+        // there is nothing else we can do here
+        console.error(
+          `contactsConfigWrapper.set during migration failed with ${err2.message} for id: ${contact.id}. Skipping contact entirely`
+        );
+      }
+    }
+  }
+
+  try {
+    const rows = db
+      .prepare(
+        `
+      SELECT MAX(COALESCE(sent_at, 0)) AS max_sent_at
+      FROM ${MESSAGES_TABLE} WHERE
+        conversationId = $conversationId AND
+        unread = $unread;
+    `
+      )
+      .get({
+        conversationId: contact.id,
+        unread: toSqliteBoolean(false), // we want to find the message read with the higher sentAt timestamp
+      });
+
+    const maxRead = rows?.max_sent_at;
+    const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
+    hasDebugEnvVariable &&
+      console.info(`Inserting contact into volatile wrapper maxread: ${contact.id} :${lastRead}`);
+    volatileConfigWrapper.set1o1(contact.id, lastRead, false);
+  } catch (e) {
+    console.error(
+      `volatileConfigWrapper.set1o1 during migration failed with ${e.message} for id: ${contact.id}. skipping`
+    );
+  }
+}
+
+/**
+ * This function returns a CommunityInfo for the wrapper to understand from the DB values.
+ * It is created in this file so we can reuse it during the migration (node side), and from the renderer side
+ */
+function getCommunityInfoFromDBValues({
+  priority,
+  fullUrl,
+}: {
+  priority: number;
+  fullUrl: string;
+}) {
+  const community = {
+    fullUrl,
+    priority: priority || 0,
+  };
+
+  return community;
+}
+
+function insertCommunityIntoWrapper(
+  community: { id: string; priority: number },
+  userGroupConfigWrapper: UserGroupsWrapperNode,
+  volatileConfigWrapper: ConvoInfoVolatileWrapperNode,
+  db: BetterSqlite3.Database,
+  version: number
+) {
+  checkTargetMigration(version, targetVersion);
+
+  const priority = community.priority;
+  const convoId = community.id; // the id of a conversation has the prefix, the serverUrl and the roomToken already present, but not the pubkey
+
+  const roomDetails = sqlNode.getV2OpenGroupRoom(convoId, db);
+  // hasDebugEnvVariable && console.info('insertCommunityIntoWrapper: ', community);
+
+  if (
+    !roomDetails ||
+    isEmpty(roomDetails) ||
+    isEmpty(roomDetails.serverUrl) ||
+    isEmpty(roomDetails.roomId) ||
+    isEmpty(roomDetails.serverPublicKey)
+  ) {
+    console.info(
+      'insertCommunityIntoWrapper did not find corresponding room details',
+      convoId,
+      roomDetails
+    );
+    return;
+  }
+  hasDebugEnvVariable ??
+    console.info(
+      `building fullUrl from serverUrl:"${roomDetails.serverUrl}" roomId:"${roomDetails.roomId}" pubkey:"${roomDetails.serverPublicKey}"`
+    );
+
+  const fullUrl = userGroupConfigWrapper.buildFullUrlFromDetails(
+    roomDetails.serverUrl,
+    roomDetails.roomId,
+    roomDetails.serverPublicKey
+  );
+  const wrapperComm = getCommunityInfoFromDBValues({
+    fullUrl,
+    priority,
+  });
+
+  try {
+    hasDebugEnvVariable && console.info('Inserting community into group wrapper: ', wrapperComm);
+    userGroupConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, wrapperComm.priority);
+    const rows = db
+      .prepare(
+        `
+      SELECT MAX(COALESCE(serverTimestamp, 0)) AS max_sent_at
+      FROM ${MESSAGES_TABLE} WHERE
+        conversationId = $conversationId AND
+        unread = $unread;
+    `
+      )
+      .get({
+        conversationId: convoId,
+        unread: toSqliteBoolean(false), // we want to find the message read with the higher serverTimestamp timestamp
+      });
+
+    const maxRead = rows?.max_sent_at;
+    const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
+    hasDebugEnvVariable &&
+      console.info(
+        `Inserting community into volatile wrapper: ${wrapperComm.fullUrl} :${lastRead}`
+      );
+    volatileConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, lastRead, false);
+  } catch (e) {
+    console.error(
+      `userGroupConfigWrapper.set during migration failed with ${e.message} for fullUrl: "${wrapperComm.fullUrl}". Skipping community entirely`
+    );
+  }
+}
+
+function getLegacyGroupInfoFromDBValues({
+  id,
+  priority,
+  members: maybeMembers,
+  displayNameInProfile,
+  // expireTimer,
+  encPubkeyHex,
+  encSeckeyHex,
+  groupAdmins: maybeAdmins,
+  lastJoinedTimestamp,
+}: Pick<
+  ConversationAttributes,
+  'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp'
+  // | 'expireTimer'
+> & {
+  encPubkeyHex: string;
+  encSeckeyHex: string;
+  members: string | Array<string>;
+  groupAdmins: string | Array<string>;
+}) {
+  const admins: Array<string> = maybeArrayJSONtoArray(maybeAdmins);
+  const members: Array<string> = maybeArrayJSONtoArray(maybeMembers);
+
+  const wrappedMembers: Array<LegacyGroupMemberInfo> = (members || []).map(m => {
+    return {
+      isAdmin: admins.includes(m),
+      pubkeyHex: m,
+    };
+  });
+  const legacyGroup: LegacyGroupInfo = {
+    pubkeyHex: id,
+    // disappearingTimerSeconds: !expireTimer ? 0 : expireTimer, // FIXME WILL add expirationMode here
+    name: displayNameInProfile || '',
+    priority: priority || 0,
+    members: wrappedMembers,
+    encPubkey: !isEmpty(encPubkeyHex) ? from_hex(encPubkeyHex) : new Uint8Array(),
+    encSeckey: !isEmpty(encSeckeyHex) ? from_hex(encSeckeyHex) : new Uint8Array(),
+    joinedAtSeconds: Math.floor(lastJoinedTimestamp / 1000),
+  };
+
+  return legacyGroup;
+}
+
+function insertLegacyGroupIntoWrapper(
+  legacyGroup: Pick<
+    ConversationAttributes,
+    'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' | 'expireTimer'
+  > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here
+  userGroupConfigWrapper: UserGroupsWrapperNode,
+  volatileInfoConfigWrapper: ConvoInfoVolatileWrapperNode,
+  db: BetterSqlite3.Database,
+  version: number
+) {
+  checkTargetMigration(version, targetVersion);
+
+  const {
+    priority,
+    id,
+    // expireTimer,
+    groupAdmins,
+    members,
+    displayNameInProfile,
+    lastJoinedTimestamp,
+  } = legacyGroup;
+
+  const latestEncryptionKeyPairHex = sqlNode.getLatestClosedGroupEncryptionKeyPair(
+    legacyGroup.id,
+    db
+  ) as HexKeyPair | undefined;
+
+  const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
+    id,
+    priority,
+    // expireTimer, // FIXME WILL add expirationMode here
+    groupAdmins,
+    members,
+    displayNameInProfile,
+    encPubkeyHex: latestEncryptionKeyPairHex?.publicHex || '',
+    encSeckeyHex: latestEncryptionKeyPairHex?.privateHex || '',
+    lastJoinedTimestamp,
+  });
+
+  try {
+    hasDebugEnvVariable &&
+      console.info('Inserting legacy group into wrapper: ', wrapperLegacyGroup);
+    userGroupConfigWrapper.setLegacyGroup(wrapperLegacyGroup);
+
+    const rows = db
+      .prepare(
+        `
+      SELECT MAX(COALESCE(sent_at, 0)) AS max_sent_at
+      FROM ${MESSAGES_TABLE} WHERE
+        conversationId = $conversationId AND
+        unread = $unread;
+    `
+      )
+      .get({
+        conversationId: id,
+        unread: toSqliteBoolean(false), // we want to find the message read with the higher sentAt timestamp
+      });
+
+    const maxRead = rows?.max_sent_at;
+    const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
+    hasDebugEnvVariable &&
+      console.info(`Inserting legacy group into volatile wrapper maxread: ${id} :${lastRead}`);
+    volatileInfoConfigWrapper.setLegacyGroup(id, lastRead, false);
+  } catch (e) {
+    console.error(
+      `userGroupConfigWrapper.set during migration failed with ${e.message} for legacyGroup.id: "${legacyGroup.id}". Skipping that legacy group entirely`
+    );
+  }
+}
+
+export const V31 = {
+  insertContactIntoContactWrapper,
+  insertCommunityIntoWrapper,
+  insertLegacyGroupIntoWrapper,
+};
diff --git a/ts/node/migration/session/migrationV33.ts b/ts/node/migration/migrationV33.ts
similarity index 90%
rename from ts/node/migration/session/migrationV33.ts
rename to ts/node/migration/migrationV33.ts
index 8d5218328..0dd06cf5d 100644
--- a/ts/node/migration/session/migrationV33.ts
+++ b/ts/node/migration/migrationV33.ts
@@ -8,17 +8,32 @@ import {
   UserConfigWrapperNode,
 } from 'libsession_util_nodejs';
 import { isArray, isEmpty, isEqual, isFinite, isNumber } from 'lodash';
-import { CONVERSATION_PRIORITIES } from '../../../models/conversationAttributes';
-import { CONFIG_DUMP_TABLE, ConfigDumpRow } from '../../../types/sqlSharedTypes';
-import { CONVERSATIONS_TABLE, MESSAGES_TABLE, toSqliteBoolean } from '../../database_utility';
-import {
-  getBlockedNumbersDuringMigration,
-  getOurAccountKeys,
-  hasDebugEnvVariable,
-  writeSessionSchemaVersion,
-} from '../sessionMigrations';
-import { DisappearingMessageMode } from '../../../util/expiringMessages';
-import { fromHexToArray } from '../../../session/utils/String';
+import { CONVERSATION_PRIORITIES } from '../../models/conversationAttributes';
+import { CONFIG_DUMP_TABLE, ConfigDumpRow } from '../../types/sqlSharedTypes';
+import { CONVERSATIONS_TABLE, MESSAGES_TABLE, toSqliteBoolean } from '../database_utility';
+import { writeSessionSchemaVersion } from './sessionMigrations';
+import { DisappearingMessageMode } from '../../util/expiringMessages';
+import { fromHexToArray } from '../../session/utils/String';
+import { getIdentityKeys } from '../sql';
+import { getBlockedNumbersDuringMigration, hasDebugEnvVariable } from './utils';
+
+/**
+ * Returns the logged in user conversation attributes and the keys.
+ * If the keys exists but a conversation for that pubkey does not exist yet, the keys are still returned
+ */
+function getLoggedInUserConvoDuringMigration(db: BetterSqlite3.Database) {
+  const ourKeys = getIdentityKeys(db);
+
+  if (!ourKeys || !ourKeys.publicKeyHex || !ourKeys.privateEd25519) {
+    return null;
+  }
+
+  const ourConversation = db.prepare(`SELECT * FROM ${CONVERSATIONS_TABLE} WHERE id = $id;`).get({
+    id: ourKeys.publicKeyHex,
+  }) as Record<string, any> | null;
+
+  return { ourKeys, ourConversation: ourConversation || null };
+}
 
 function getContactInfoFromDBValues({
   id,
@@ -169,11 +184,8 @@ function insertContactIntoContactWrapper(
   }
 }
 
-export default function updateToSessionSchemaVersion33(
-  currentVersion: number,
-  db: BetterSqlite3.Database
-) {
-  const targetVersion = 33;
+export function updateToSessionSchemaVersion34(currentVersion: number, db: BetterSqlite3.Database) {
+  const targetVersion = 34;
   if (currentVersion >= targetVersion) {
     return;
   }
@@ -183,15 +195,13 @@ export default function updateToSessionSchemaVersion33(
   console.log(`updateToSessionSchemaVersion${targetVersion}: starting...`);
   db.transaction(() => {
     try {
-      const keys = getOurAccountKeys(db);
-
-      const userAlreadyCreated = !!keys && !isEmpty(keys.privateEd25519);
+      const loggedInUser = getLoggedInUserConvoDuringMigration(db);
 
-      if (!userAlreadyCreated) {
+      if (!loggedInUser || !loggedInUser.ourKeys) {
         throw new Error('privateEd25519 was empty. Considering no users are logged in');
       }
 
-      const { privateEd25519, publicKeyHex } = keys;
+      const { privateEd25519, publicKeyHex } = loggedInUser.ourKeys;
 
       // Conversation changes
       // TODO can this be moved into libsession completely
diff --git a/ts/node/migration/sessionMigrations.ts b/ts/node/migration/sessionMigrations.ts
index 002c8236e..570e6e395 100644
--- a/ts/node/migration/sessionMigrations.ts
+++ b/ts/node/migration/sessionMigrations.ts
@@ -6,20 +6,13 @@ import {
   UserConfigWrapperNode,
   UserGroupsWrapperNode,
 } from 'libsession_util_nodejs';
-import { compact, isArray, isEmpty, isFinite, isNil, isNumber, isString, map, pick } from 'lodash';
+import { compact, isArray, isEmpty, isNil, isString, map, pick } from 'lodash';
 import {
   CONVERSATION_PRIORITIES,
   ConversationAttributes,
 } from '../../models/conversationAttributes';
-import { HexKeyPair } from '../../receiver/keypairs';
 import { fromHexToArray } from '../../session/utils/String';
-import {
-  CONFIG_DUMP_TABLE,
-  ConfigDumpRow,
-  getCommunityInfoFromDBValues,
-  getContactInfoFromDBValues,
-  getLegacyGroupInfoFromDBValues,
-} from '../../types/sqlSharedTypes';
+import { CONFIG_DUMP_TABLE, ConfigDumpRow } from '../../types/sqlSharedTypes';
 import {
   CLOSED_GROUP_V2_KEY_PAIRS_TABLE,
   CONVERSATIONS_TABLE,
@@ -31,7 +24,6 @@ import {
   dropFtsAndTriggers,
   objectToJSON,
   rebuildFtsTable,
-  toSqliteBoolean,
 } from '../database_utility';
 
 import { sqlNode } from '../sql';
@@ -42,6 +34,7 @@ import {
   getLoggedInUserConvoDuringMigration,
   hasDebugEnvVariable,
 } from './utils';
+import MIGRATION_HELPERS from './helpers';
 
 // eslint:disable: quotemark one-variable-per-declaration no-unused-expression
 
@@ -1216,231 +1209,6 @@ function updateToSessionSchemaVersion29(currentVersion: number, db: BetterSqlite
   console.log(`updateToSessionSchemaVersion${targetVersion}: success!`);
 }
 
-function insertContactIntoContactWrapper(
-  contact: any,
-  blockedNumbers: Array<string>,
-  contactsConfigWrapper: ContactsConfigWrapperNode | null, // set this to null to only insert into the convo volatile wrapper (i.e. for ourConvo case)
-  volatileConfigWrapper: ConvoInfoVolatileWrapperNode,
-  db: BetterSqlite3.Database
-) {
-  if (contactsConfigWrapper !== null) {
-    const dbApproved = !!contact.isApproved || false;
-    const dbApprovedMe = !!contact.didApproveMe || false;
-    const dbBlocked = blockedNumbers.includes(contact.id);
-    const priority = contact.priority || CONVERSATION_PRIORITIES.default;
-
-    const wrapperContact = getContactInfoFromDBValues({
-      id: contact.id,
-      dbApproved,
-      dbApprovedMe,
-      dbBlocked,
-      dbName: contact.displayNameInProfile || undefined,
-      dbNickname: contact.nickname || undefined,
-      dbProfileKey: contact.profileKey || undefined,
-      dbProfileUrl: contact.avatarPointer || undefined,
-      priority,
-      dbCreatedAtSeconds: Math.floor((contact.active_at || Date.now()) / 1000),
-    });
-
-    try {
-      hasDebugEnvVariable && console.info('Inserting contact into wrapper: ', wrapperContact);
-      contactsConfigWrapper.set(wrapperContact);
-    } catch (e) {
-      console.error(
-        `contactsConfigWrapper.set during migration failed with ${e.message} for id: ${contact.id}`
-      );
-      // the wrapper did not like something. Try again with just the boolean fields as it's most likely the issue is with one of the strings (which could be recovered)
-      try {
-        hasDebugEnvVariable && console.info('Inserting edited contact into wrapper: ', contact.id);
-        contactsConfigWrapper.set(
-          getContactInfoFromDBValues({
-            id: contact.id,
-            dbApproved,
-            dbApprovedMe,
-            dbBlocked,
-            dbName: undefined,
-            dbNickname: undefined,
-            dbProfileKey: undefined,
-            dbProfileUrl: undefined,
-            priority: CONVERSATION_PRIORITIES.default,
-            dbCreatedAtSeconds: Math.floor(Date.now() / 1000),
-          })
-        );
-      } catch (err2) {
-        // there is nothing else we can do here
-        console.error(
-          `contactsConfigWrapper.set during migration failed with ${err2.message} for id: ${contact.id}. Skipping contact entirely`
-        );
-      }
-    }
-  }
-
-  try {
-    const rows = db
-      .prepare(
-        `
-      SELECT MAX(COALESCE(sent_at, 0)) AS max_sent_at
-      FROM ${MESSAGES_TABLE} WHERE
-        conversationId = $conversationId AND
-        unread = $unread;
-    `
-      )
-      .get({
-        conversationId: contact.id,
-        unread: toSqliteBoolean(false), // we want to find the message read with the higher sentAt timestamp
-      });
-
-    const maxRead = rows?.max_sent_at;
-    const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
-    hasDebugEnvVariable &&
-      console.info(`Inserting contact into volatile wrapper maxread: ${contact.id} :${lastRead}`);
-    volatileConfigWrapper.set1o1(contact.id, lastRead, false);
-  } catch (e) {
-    console.error(
-      `volatileConfigWrapper.set1o1 during migration failed with ${e.message} for id: ${contact.id}. skipping`
-    );
-  }
-}
-
-function insertCommunityIntoWrapper(
-  community: { id: string; priority: number },
-  userGroupConfigWrapper: UserGroupsWrapperNode,
-  volatileConfigWrapper: ConvoInfoVolatileWrapperNode,
-  db: BetterSqlite3.Database
-) {
-  const priority = community.priority;
-  const convoId = community.id; // the id of a conversation has the prefix, the serverUrl and the roomToken already present, but not the pubkey
-
-  const roomDetails = sqlNode.getV2OpenGroupRoom(convoId, db);
-  // hasDebugEnvVariable && console.info('insertCommunityIntoWrapper: ', community);
-
-  if (
-    !roomDetails ||
-    isEmpty(roomDetails) ||
-    isEmpty(roomDetails.serverUrl) ||
-    isEmpty(roomDetails.roomId) ||
-    isEmpty(roomDetails.serverPublicKey)
-  ) {
-    console.info(
-      'insertCommunityIntoWrapper did not find corresponding room details',
-      convoId,
-      roomDetails
-    );
-    return;
-  }
-  hasDebugEnvVariable ??
-    console.info(
-      `building fullUrl from serverUrl:"${roomDetails.serverUrl}" roomId:"${roomDetails.roomId}" pubkey:"${roomDetails.serverPublicKey}"`
-    );
-
-  const fullUrl = userGroupConfigWrapper.buildFullUrlFromDetails(
-    roomDetails.serverUrl,
-    roomDetails.roomId,
-    roomDetails.serverPublicKey
-  );
-  const wrapperComm = getCommunityInfoFromDBValues({
-    fullUrl,
-    priority,
-  });
-
-  try {
-    hasDebugEnvVariable && console.info('Inserting community into group wrapper: ', wrapperComm);
-    userGroupConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, wrapperComm.priority);
-    const rows = db
-      .prepare(
-        `
-      SELECT MAX(COALESCE(serverTimestamp, 0)) AS max_sent_at
-      FROM ${MESSAGES_TABLE} WHERE
-        conversationId = $conversationId AND
-        unread = $unread;
-    `
-      )
-      .get({
-        conversationId: convoId,
-        unread: toSqliteBoolean(false), // we want to find the message read with the higher serverTimestamp timestamp
-      });
-
-    const maxRead = rows?.max_sent_at;
-    const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
-    hasDebugEnvVariable &&
-      console.info(
-        `Inserting community into volatile wrapper: ${wrapperComm.fullUrl} :${lastRead}`
-      );
-    volatileConfigWrapper.setCommunityByFullUrl(wrapperComm.fullUrl, lastRead, false);
-  } catch (e) {
-    console.error(
-      `userGroupConfigWrapper.set during migration failed with ${e.message} for fullUrl: "${wrapperComm.fullUrl}". Skipping community entirely`
-    );
-  }
-}
-
-function insertLegacyGroupIntoWrapper(
-  legacyGroup: Pick<
-    ConversationAttributes,
-    'id' | 'priority' | 'displayNameInProfile' | 'lastJoinedTimestamp' | 'expireTimer'
-  > & { members: string; groupAdmins: string }, // members and groupAdmins are still stringified here
-  userGroupConfigWrapper: UserGroupsWrapperNode,
-  volatileInfoConfigWrapper: ConvoInfoVolatileWrapperNode,
-  db: BetterSqlite3.Database
-) {
-  const {
-    priority,
-    id,
-    // expireTimer,
-    groupAdmins,
-    members,
-    displayNameInProfile,
-    lastJoinedTimestamp,
-  } = legacyGroup;
-
-  const latestEncryptionKeyPairHex = sqlNode.getLatestClosedGroupEncryptionKeyPair(
-    legacyGroup.id,
-    db
-  ) as HexKeyPair | undefined;
-
-  const wrapperLegacyGroup = getLegacyGroupInfoFromDBValues({
-    id,
-    priority,
-    // expireTimer, // FIXME WILL add expirationMode here
-    groupAdmins,
-    members,
-    displayNameInProfile,
-    encPubkeyHex: latestEncryptionKeyPairHex?.publicHex || '',
-    encSeckeyHex: latestEncryptionKeyPairHex?.privateHex || '',
-    lastJoinedTimestamp,
-  });
-
-  try {
-    hasDebugEnvVariable &&
-      console.info('Inserting legacy group into wrapper: ', wrapperLegacyGroup);
-    userGroupConfigWrapper.setLegacyGroup(wrapperLegacyGroup);
-
-    const rows = db
-      .prepare(
-        `
-      SELECT MAX(COALESCE(sent_at, 0)) AS max_sent_at
-      FROM ${MESSAGES_TABLE} WHERE
-        conversationId = $conversationId AND
-        unread = $unread;
-    `
-      )
-      .get({
-        conversationId: id,
-        unread: toSqliteBoolean(false), // we want to find the message read with the higher sentAt timestamp
-      });
-
-    const maxRead = rows?.max_sent_at;
-    const lastRead = isNumber(maxRead) && isFinite(maxRead) ? maxRead : 0;
-    hasDebugEnvVariable &&
-      console.info(`Inserting legacy group into volatile wrapper maxread: ${id} :${lastRead}`);
-    volatileInfoConfigWrapper.setLegacyGroup(id, lastRead, false);
-  } catch (e) {
-    console.error(
-      `userGroupConfigWrapper.set during migration failed with ${e.message} for legacyGroup.id: "${legacyGroup.id}". Skipping that legacy group entirely`
-    );
-  }
-}
-
 function updateToSessionSchemaVersion30(currentVersion: number, db: BetterSqlite3.Database) {
   const targetVersion = 30;
   if (currentVersion >= targetVersion) {
@@ -1612,12 +1380,13 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
         });
       }
 
-      insertContactIntoContactWrapper(
+      MIGRATION_HELPERS.V31.insertContactIntoContactWrapper(
         ourConversation,
         blockedNumbers,
         null,
         volatileInfoConfigWrapper,
-        db
+        db,
+        targetVersion
       );
 
       // dump the user wrapper content and save it to the DB
@@ -1658,12 +1427,13 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
         );
 
         contactsToWriteInWrapper.forEach(contact => {
-          insertContactIntoContactWrapper(
+          MIGRATION_HELPERS.V31.insertContactIntoContactWrapper(
             contact,
             blockedNumbers,
             contactsConfigWrapper,
             volatileInfoConfigWrapper,
-            db
+            db,
+            targetVersion
           );
         });
 
@@ -1705,11 +1475,12 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
 
         communitiesToWriteInWrapper.forEach(community => {
           try {
-            insertCommunityIntoWrapper(
+            MIGRATION_HELPERS.V31.insertCommunityIntoWrapper(
               community,
               userGroupsConfigWrapper,
               volatileInfoConfigWrapper,
-              db
+              db,
+              targetVersion
             );
           } catch (e) {
             console.info(`failed to insert community with ${e.message}`, community);
@@ -1738,11 +1509,12 @@ function updateToSessionSchemaVersion31(currentVersion: number, db: BetterSqlite
             hasDebugEnvVariable &&
               console.info('Writing legacy group: ', JSON.stringify(legacyGroup));
 
-            insertLegacyGroupIntoWrapper(
+            MIGRATION_HELPERS.V31.insertLegacyGroupIntoWrapper(
               legacyGroup,
               userGroupsConfigWrapper,
               volatileInfoConfigWrapper,
-              db
+              db,
+              targetVersion
             );
           } catch (e) {
             console.info(`failed to insert legacy group with ${e.message}`, legacyGroup);
diff --git a/ts/node/migration/utils.ts b/ts/node/migration/utils.ts
index 38b819c05..8eeff36af 100644
--- a/ts/node/migration/utils.ts
+++ b/ts/node/migration/utils.ts
@@ -6,6 +6,19 @@ import { getIdentityKeys, sqlNode } from '../sql';
 
 export const hasDebugEnvVariable = Boolean(process.env.SESSION_DEBUG);
 
+/**
+ * Verify we are calling the correct helper function in the correct migration before running it.
+ *
+ * You don't need to call this on functions that aren't being exported as helper functions in a file
+ * @param version
+ * @param targetVersion
+ */
+export function checkTargetMigration(version: number, targetVersion: number) {
+  if (version !== targetVersion) {
+    throw new Error(`Migration target mismatch. Expected: ${targetVersion}, Found: ${version}`);
+  }
+}
+
 /**
  * Returns the logged in user conversation attributes and the keys.
  * If the keys exists but a conversation for that pubkey does not exist yet, the keys are still returned
diff --git a/ts/types/sqlSharedTypes.ts b/ts/types/sqlSharedTypes.ts
index 88e1ac0de..22e9ae8cf 100644
--- a/ts/types/sqlSharedTypes.ts
+++ b/ts/types/sqlSharedTypes.ts
@@ -105,6 +105,8 @@ export type SaveConversationReturn = {
 } | null;
 
 /**
+ * NOTE This code should always match the last known version of the same function used in a libsession migration (V31)
+ *
  * This function returns a contactInfo for the wrapper to understand from the DB values.
  * Created in this file so we can reuse it during the migration (node side), and from the renderer side
  */
@@ -156,6 +158,8 @@ export function getContactInfoFromDBValues({
 }
 
 /**
+ * NOTE This code should always match the last known version of the same function used in a libsession migration (V31)
+ *
  * This function returns a CommunityInfo for the wrapper to understand from the DB values.
  * It is created in this file so we can reuse it during the migration (node side), and from the renderer side
  */
@@ -174,7 +178,7 @@ export function getCommunityInfoFromDBValues({
   return community;
 }
 
-function maybeArrayJSONtoArray(arr: string | Array<string>): Array<string> {
+export function maybeArrayJSONtoArray(arr: string | Array<string>): Array<string> {
   try {
     if (isArray(arr)) {
       return arr;
@@ -190,6 +194,9 @@ function maybeArrayJSONtoArray(arr: string | Array<string>): Array<string> {
   }
 }
 
+/**
+ * NOTE This code should always match the last known version of the same function used in a libsession migration (V31)
+ */
 export function getLegacyGroupInfoFromDBValues({
   id,
   priority,