diff --git a/.gitignore b/.gitignore
index 44c040641..3525c32fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ Thumbs.db
 # mongodb data
 /mongodb-data/*
 !/mongodb-data/.gitkeep
+/mongodb-data2/*
 
 
 # environment variables
diff --git a/apps/api/scripts/seed-database.js b/apps/api/scripts/seed-database.js
index c33f99a5f..8e59efffa 100644
--- a/apps/api/scripts/seed-database.js
+++ b/apps/api/scripts/seed-database.js
@@ -11,6 +11,7 @@ const {
   tap,
   toArray,
   delay,
+  mergeMap,
 } = require('rxjs/operators')
 const moment = require('moment')
 
@@ -24,6 +25,19 @@ const {
   RoleMapping,
 } = app.models
 
+function pickRandomArrayElement(array) {
+  return array[Math.floor(Math.random() * array.length)]
+}
+function pickRandomArrayElements(array, maxCount) {
+  const count = maxCount
+    ? maxCount
+    : randomNumberInRange(1, Math.min(array.length))
+  return _.sampleSize(array, count)
+}
+function randomNumberInRange(min, max) {
+  return Math.floor(Math.random() * (max - min + 1)) + min
+}
+
 const personsRaw = require('./random-names.json')
 const persons = []
 personsRaw.forEach((person) => {
@@ -37,6 +51,403 @@ personsRaw.forEach((person) => {
   }
 })
 
+const MENTORING_GOALS = {
+  buildingAProfessionalNetwork: 'Building a professional network',
+  jobSearchAndApplicationProcess: 'Job search and application process',
+  entrepreneurshipAndFreelancing: 'Entrepreneurship and freelancing',
+  tutoringInAParticularSkillTool: 'Tutoring in a particular skill / tool',
+  careerOrientatioPlanning: 'Career orientation & planning',
+  preparationForACertificationInterview:
+    'Preparation for a certification / interview',
+}
+const mentoringGoalsKeys = Object.keys(MENTORING_GOALS)
+
+const DESIRED_ROLES = {
+  marketingSocialMediaAndSales: 'Marketing, social media and sales',
+  productAndProjectManagement: 'Product and project management',
+  requirementsAnalysisAndResearch: 'Requirements analysis and research',
+  softwareDevelopment: 'Software development',
+  uxAndUiDesign: 'UX and UI design',
+  testingAndQualityAssurance: 'Testing and Quality Assurance',
+  // other: 'Other', // specifically commented out as there are no
+  // mentoring topics in the group 'other'. It causes issues when seeding
+}
+const desiredRolesKeys = Object.keys(DESIRED_ROLES)
+
+const FIELDS_OF_EXPERTISE = {
+  humanResourcesAndRecruiting: 'Human resources and recruiting',
+  ...DESIRED_ROLES,
+}
+const fieldsOfExpertiseKeys = Object.keys(FIELDS_OF_EXPERTISE)
+
+const MENTORING_TOPICS = [
+  {
+    id: 'Application process and portfolio',
+    label: 'Application process and portfolio',
+    group: 'overarchingTopics',
+  },
+  { id: 'Communication', label: 'Communication', group: 'overarchingTopics' },
+  {
+    id: 'Cross-cultural teams',
+    label: 'Cross-cultural teams',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Cross-functional work',
+    label: 'Cross-functional work',
+    group: 'overarchingTopics',
+  },
+  { id: 'Facilitation', label: 'Facilitation', group: 'overarchingTopics' },
+  {
+    id: 'Giving / receiving feedback',
+    label: 'Giving / receiving feedback',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Self-organisation',
+    label: 'Self-organisation',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Social network profile tuning',
+    label: 'Social network profile tuning',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Storytelling and presentation',
+    label: 'Storytelling and presentation',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Team leadership',
+    label: 'Team leadership',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Time management',
+    label: 'Time management',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Marketing and social media',
+    label: 'Marketing and social media',
+    group: 'marketingSocialMediaAndSales',
+  },
+  { id: 'Sales', label: 'Sales', group: 'marketingSocialMediaAndSales' },
+  {
+    id: 'Data analysis',
+    label: 'Data analysis',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Design research',
+    label: 'Design research',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Design Thinking',
+    label: 'Design Thinking',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Domain driven design',
+    label: 'Domain driven design',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Mapping customer experience',
+    label: 'Mapping customer experience',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Prioritisation metrics',
+    label: 'Prioritisation metrics',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Process modelling',
+    label: 'Process modelling',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Software Development Life Cycle',
+    label: 'Software Development Life Cycle',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Technical writing',
+    label: 'Technical writing',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'User story mapping',
+    label: 'User story mapping',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Qualitative User Research',
+    label: 'Qualitative User Research',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Quantitative User Research',
+    label: 'Quantitative User Research',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  { id: 'Animation', label: 'Animation', group: 'uxAndUiDesign' },
+  { id: 'Branding', label: 'Branding', group: 'uxAndUiDesign' },
+  {
+    id: 'General user experience',
+    label: 'General user experience',
+    group: 'uxAndUiDesign',
+  },
+  { id: 'Graphic Design', label: 'Graphic Design', group: 'uxAndUiDesign' },
+  {
+    id: 'Information architecture',
+    label: 'Information architecture',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Interaction design',
+    label: 'Interaction design',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Prototyping and wireframing',
+    label: 'Prototyping and wireframing',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Responsive design',
+    label: 'Responsive design',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Typography / color theory',
+    label: 'Typography / color theory',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Visual communication',
+    label: 'Visual communication',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Automated software testing',
+    label: 'Automated software testing',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Behavior-driven development',
+    label: 'Behavior-driven development',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Cross-browser testing',
+    label: 'Cross-browser testing',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Functional Testing',
+    label: 'Functional Testing',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Software testing methodologies',
+    label: 'Software testing methodologies',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Test-driven development',
+    label: 'Test-driven development',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Test planning',
+    label: 'Test planning',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Test management',
+    label: 'Test management',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Usability testing',
+    label: 'Usability testing',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Agile frameworks',
+    label: 'Agile frameworks',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Budget calculation',
+    label: 'Budget calculation',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Business development',
+    label: 'Business development',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Change management',
+    label: 'Change management',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Enterprise architecture management',
+    label: 'Enterprise architecture management',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Market research',
+    label: 'Market research',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Planning and roadmaps',
+    label: 'Planning and roadmaps',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Prioritisation metrics',
+    label: 'Prioritisation metrics',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Product Backlog management',
+    label: 'Product Backlog management',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Product management',
+    label: 'Product management',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Project management',
+    label: 'Project management',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Project management office',
+    label: 'Project management office',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Value-driven product development',
+    label: 'Value-driven product development',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Value metrics',
+    label: 'Value metrics',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Android Mobile Development',
+    label: 'Android Mobile Development',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Basic programming skills',
+    label: 'Basic programming skills',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Computer networking',
+    label: 'Computer networking',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Cross-browser development',
+    label: 'Cross-browser development',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Data analytics',
+    label: 'Data analytics',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Database management',
+    label: 'Database management',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'DevOps and Cloud',
+    label: 'DevOps and Cloud',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Hybrid App Development',
+    label: 'Hybrid App Development',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Hardware and networks',
+    label: 'Hardware and networks',
+    group: 'softwareDevelopment',
+  },
+  { id: 'IoT', label: 'IoT', group: 'softwareDevelopment' },
+  {
+    id: 'iOS Mobile Development',
+    label: 'iOS Mobile Development',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Machine learning',
+    label: 'Machine learning',
+    group: 'softwareDevelopment',
+  },
+  { id: 'Security', label: 'Security', group: 'softwareDevelopment' },
+  {
+    id: 'Atlassian Jira',
+    label: 'Atlassian Jira',
+    group: 'toolsAndFrameworks',
+  },
+  { id: 'AWS', label: 'AWS', group: 'toolsAndFrameworks' },
+  { id: 'Azure', label: 'Azure', group: 'toolsAndFrameworks' },
+  {
+    id: 'Balsamiq Mockup',
+    label: 'Balsamiq Mockup',
+    group: 'toolsAndFrameworks',
+  },
+  { id: 'Blockchain', label: 'Blockchain', group: 'toolsAndFrameworks' },
+  { id: 'Cucumber', label: 'Cucumber', group: 'toolsAndFrameworks' },
+  { id: 'Cypress', label: 'Cypress', group: 'toolsAndFrameworks' },
+  { id: 'Docker', label: 'Docker', group: 'toolsAndFrameworks' },
+  { id: 'Figma', label: 'Figma', group: 'toolsAndFrameworks' },
+  { id: 'Flutter', label: 'Flutter', group: 'toolsAndFrameworks' },
+  { id: 'GCP', label: 'GCP', group: 'toolsAndFrameworks' },
+  { id: 'Git', label: 'Git', group: 'toolsAndFrameworks' },
+  { id: 'Gherkin', label: 'Gherkin', group: 'toolsAndFrameworks' },
+  { id: 'HTML & CSS', label: 'HTML & CSS', group: 'toolsAndFrameworks' },
+  { id: 'Java', label: 'Java', group: 'toolsAndFrameworks' },
+  { id: 'JavaScript', label: 'JavaScript', group: 'toolsAndFrameworks' },
+  { id: 'Jest', label: 'Jest', group: 'toolsAndFrameworks' },
+  { id: 'MongoDB', label: 'MongoDB', group: 'toolsAndFrameworks' },
+  { id: 'MySQL', label: 'MySQL', group: 'toolsAndFrameworks' },
+  { id: 'NodeJS', label: 'NodeJS', group: 'toolsAndFrameworks' },
+  { id: 'Python', label: 'Python', group: 'toolsAndFrameworks' },
+  { id: 'React', label: 'React', group: 'toolsAndFrameworks' },
+  { id: 'React Native', label: 'React Native', group: 'toolsAndFrameworks' },
+  { id: "REST API's", label: "REST API's", group: 'toolsAndFrameworks' },
+  { id: 'Salesforce', label: 'Salesforce', group: 'toolsAndFrameworks' },
+  { id: 'Selenium', label: 'Selenium', group: 'toolsAndFrameworks' },
+  { id: 'Sketch', label: 'Sketch', group: 'toolsAndFrameworks' },
+  { id: 'SQL', label: 'SQL', group: 'toolsAndFrameworks' },
+  { id: 'Xray', label: 'Xray', group: 'toolsAndFrameworks' },
+  { id: 'Zephyr', label: 'Zephyr', group: 'toolsAndFrameworks' },
+  { id: 'VMWare', label: 'VMWare', group: 'toolsAndFrameworks' },
+  { id: 'Virtual Box', label: 'Virtual Box', group: 'toolsAndFrameworks' },
+]
+const mentoringTopicsKeys = MENTORING_TOPICS.map((topic) => topic.id)
+const mentoringTopicsByDesiredRole = _.groupBy(MENTORING_TOPICS, 'group')
+
 const categories = [
   {
     id: 'basicProgrammingSkills',
@@ -170,7 +581,7 @@ const categories = [
   },
   { id: 'entrepreneurship', label: 'Entrepreneurship', group: 'careerSupport' },
   { id: 'freelancing', label: 'Freelancing', group: 'careerSupport' },
-]
+].map((p) => p.id)
 
 const Languages = ['German', 'Arabic', 'Farsi', 'Tigrinya']
 
@@ -235,6 +646,67 @@ const pickRandomUserType = () => {
   return possibleUserTypes[randomIndex]
 }
 
+const addMentorSpecificProperties = (profile) => {
+  profile.mentor_mentoringTopics = pickRandomArrayElements(
+    mentoringTopicsKeys,
+    6
+  )
+  profile.mentor_mentoringGoals = pickRandomArrayElements(mentoringGoalsKeys, 2)
+  profile.mentor_professionalExperienceFields = pickRandomArrayElements(
+    fieldsOfExpertiseKeys,
+    2
+  )
+  return profile
+}
+
+const addMenteeSpecificProperties = (profile) => {
+  profile.mentee_mentoringGoal = pickRandomArrayElement(mentoringGoalsKeys)
+  profile.mentee_overarchingMentoringTopics = pickRandomArrayElements(
+    mentoringTopicsByDesiredRole['overarchingTopics'].map((p) => p.id),
+    3
+  )
+  profile.mentee_primaryRole_fieldOfExpertise =
+    pickRandomArrayElement(desiredRolesKeys)
+  if (
+    !mentoringTopicsByDesiredRole[profile.mentee_primaryRole_fieldOfExpertise]
+  ) {
+    console.log(profile.mentee_primaryRole_fieldOfExpertise)
+    console.log(
+      mentoringTopicsByDesiredRole[profile.mentee_primaryRole_fieldOfExpertise]
+    )
+  }
+  profile.mentee_primaryRole_mentoringTopics = pickRandomArrayElements(
+    mentoringTopicsByDesiredRole[
+      profile.mentee_primaryRole_fieldOfExpertise
+    ].map((p) => p.id),
+    3
+  )
+  profile.mentee_secondaryRole_fieldOfExpertise =
+    pickRandomArrayElement(desiredRolesKeys)
+  if (
+    !mentoringTopicsByDesiredRole[profile.mentee_secondaryRole_fieldOfExpertise]
+  ) {
+    console.log(profile.mentee_secondaryRole_fieldOfExpertise)
+    console.log(
+      mentoringTopicsByDesiredRole[
+        profile.mentee_secondaryRole_fieldOfExpertise
+      ]
+    )
+  }
+  profile.mentee_secondaryRole_mentoringTopics = pickRandomArrayElements(
+    mentoringTopicsByDesiredRole[
+      profile.mentee_secondaryRole_fieldOfExpertise
+    ].map((p) => p.id),
+    3
+  )
+  profile.mentee_toolsAndFrameworks_mentoringTopics = pickRandomArrayElements(
+    mentoringTopicsByDesiredRole['toolsAndFrameworks'].map((p) => p.id),
+    6
+  )
+
+  return profile
+}
+
 const users = fp.compose(
   fp.take(1000),
   fp.map(({ name, surname, gender }) => {
@@ -242,7 +714,7 @@ const users = fp.compose(
       Math.random() > 0.5 ? 'berlin' : Math.random() > 0.5 ? 'munich' : 'nrw'
     const email = randomString() + '@' + randomString() + '.com'
     const password = email
-    return {
+    const profile = {
       redUser: {
         email,
         password,
@@ -272,8 +744,8 @@ const users = fp.compose(
         mentee_occupationOther_description: randomString(),
         profileAvatarImageS3Key:
           'c1774822-9495-4bd6-866a-bf4d28aaddc8_ScreenShot2019-03-12at22.22.20.png',
-        languages: Languages.filter(() => Math.random() > 0.5).concat(
-          'English'
+        languages: ['English'].concat(
+          Languages.filter(() => Math.random() > 0.5)
         ),
         otherLanguages: randomString(),
         personalDescription: randomString(undefined, 300),
@@ -292,6 +764,12 @@ const users = fp.compose(
           courses[Math.floor(Math.random() * courses.length)].id,
       },
     }
+    if (profile.redProfile.userType.indexOf('mentee') !== -1) {
+      addMenteeSpecificProperties(profile.redProfile)
+    } else {
+      addMentorSpecificProperties(profile.redProfile)
+    }
+    return profile
   })
 )(persons)
 
@@ -363,6 +841,7 @@ const ericMenteeRedProfile = {
   mentee_currentlyEnrolledInCourse: 'salesforceFundamentals',
   username: 'career+testmentee@redi-school.org',
 }
+addMenteeSpecificProperties(ericMenteeRedProfile)
 
 const ericMentorRedUser = {
   password: 'career+testmentor@redi-school.org',
@@ -404,6 +883,7 @@ const ericMentorRedProfile = {
   menteeCountCapacity: 2,
   username: 'career+testmentor@redi-school.org',
 }
+addMentorSpecificProperties(ericMentorRedProfile)
 
 const ericAdminUser = {
   email: 'cloud-accounts@redi-school.org',
@@ -442,7 +922,7 @@ const ericAdminRedProfile = {
   githubProfileUrl: '',
   telephoneNumber: '',
   categories: categories.map((c) => c.id).filter(() => Math.random() < 0.4),
-  menteeCountCapacity: 2,
+  menteeCountCapacity: 0,
   username: 'cloud-accounts@redi-school.org',
 }
 
@@ -455,7 +935,7 @@ Rx.of({})
     switchMap(redUserDestroyAll),
     switchMap(redProfileDestroyAll),
     tap(() => console.log('destroyed')),
-    delay(10000),
+    delay(2000),
     // switchMap(redMentoringSessionDestroyAll),
     switchMap(() => redUserCreate(ericAdminUser)),
     switchMap((redUser) =>
@@ -471,14 +951,16 @@ Rx.of({})
       redProfileCreateOnRedUser(redUser)(ericMentorRedProfile)
     ),
     switchMapTo(users),
-    concatMap(
+    mergeMap(
       (userData) => redUserCreate(userData.redUser),
-      (userData, redUserInst) => ({ ...userData, redUserInst })
+      (userData, redUserInst) => ({ ...userData, redUserInst }),
+      10
     ),
-    concatMap(
+    mergeMap(
       (userData) =>
         redProfileCreateOnRedUser(userData.redUserInst)(userData.redProfile),
-      (userData, redProfileInst) => ({ ...userData, redProfileInst })
+      (userData, redProfileInst) => ({ ...userData, redProfileInst }),
+      10
     ),
     toArray(),
     // Pick X mentor-mentee pairs, create match
diff --git a/apps/redi-connect/src/assets/locales/en/translation.json b/apps/redi-connect/src/assets/locales/en/translation.json
index 0192236d3..4e3d48dd8 100644
--- a/apps/redi-connect/src/assets/locales/en/translation.json
+++ b/apps/redi-connect/src/assets/locales/en/translation.json
@@ -186,7 +186,8 @@
     "profile": {
       "notification": {
         "pendingMentor": "<strong>Thanks for signing up!</strong> We are reviewing your profile and will send you an email once we're done. Students will be able to apply to become your mentee once your account is active.",
-        "pendingMentee": "<strong>Thanks for signing up!</strong> Please schedule a time for an onboarding session with us. You find the link in the email you received. You’ll be able to find a mentor once your account is active.",
+        "pendingMentee": "<strong>Thanks for signing up!</strong> Please schedule a time for an onboarding session with us. You find the link in the email you received. Meanwhile, we encourage you to fill in your profile.",
+        "missingMentoringGoal": "<strong>Welcome to ReDI Connect!</strong> Please fill in your profile and select a <strong>mentoring goal</strong> and a <strong>primary role</strong> you would like to be mentored on. You will be able to find a mentor once your profile is complete.",
         "deactivatedMentee": "Dear {{ name }}, your ReDI Connect profile has been deactivated by the Career Support Team. This could be for a number of reasons. If you think this has been done by mistake, please contact Paulina at {{ email }}. Thank you!",
         "deactivatedMentor": "Dear {{ name }}, your ReDI Connect profile has been deactivated by the Career Support Team. Likely you have not been active for a while. This means you are not visible to prospective mentees. If you want to become active as a mentor again, please contact Miriam at {{ email }}. Speak soon!"
       }
diff --git a/apps/redi-connect/src/components/molecules/ReadMentoringGoals.tsx b/apps/redi-connect/src/components/molecules/ReadMentoringGoals.tsx
new file mode 100644
index 000000000..35ce4f58d
--- /dev/null
+++ b/apps/redi-connect/src/components/molecules/ReadMentoringGoals.tsx
@@ -0,0 +1,56 @@
+import {
+  Caption,
+  CardTags,
+  CardTagsProps,
+  Placeholder,
+} from '@talent-connect/shared-atomic-design-components'
+import { MENTORING_GOALS } from '@talent-connect/shared-config'
+import { RedProfile } from '@talent-connect/shared-types'
+import React from 'react'
+import { connect } from 'react-redux'
+import { RootState } from '../../redux/types'
+
+interface ReadMentoringProps {
+  profile: RedProfile
+  caption?: boolean
+}
+
+export const ProfileTags = ({ items, shortList }: CardTagsProps) => (
+  <CardTags
+    items={items}
+    shortList={shortList}
+    formatter={(item: string) => MENTORING_GOALS[item]}
+  />
+)
+
+const ReadMentoringGoals = ({ profile, caption }: ReadMentoringProps) => {
+  const { mentor_mentoringGoals: mentoringGoals } = profile
+
+  if (!mentoringGoals?.length && !caption)
+    return (
+      <Placeholder>
+        Select at least one goal you would like to support mentees with
+      </Placeholder>
+    )
+
+  return (
+    <>
+      {caption && <Caption>Mentoring goals</Caption>}
+      <ProfileTags items={mentoringGoals} />
+    </>
+  )
+}
+
+const mapStateToProps = (state: RootState) => ({
+  profile: state.user.profile as RedProfile,
+})
+
+export default {
+  Me: connect(mapStateToProps, {})(ReadMentoringGoals),
+  Some: ({ profile }: ReadMentoringProps) => (
+    <ReadMentoringGoals profile={profile} caption />
+  ),
+  Tags: ({ items, shortList }: CardTagsProps) => (
+    <ProfileTags items={items} shortList />
+  ),
+}
diff --git a/apps/redi-connect/src/components/molecules/ReadMentoringTopicsNew2022.tsx b/apps/redi-connect/src/components/molecules/ReadMentoringTopicsNew2022.tsx
new file mode 100644
index 000000000..5ed9a378c
--- /dev/null
+++ b/apps/redi-connect/src/components/molecules/ReadMentoringTopicsNew2022.tsx
@@ -0,0 +1,55 @@
+import {
+  Caption,
+  CardTags,
+  CardTagsProps,
+  Placeholder,
+} from '@talent-connect/shared-atomic-design-components'
+import { MENTORING_TOPICS_MAP } from '@talent-connect/shared-config'
+import { RedProfile } from '@talent-connect/shared-types'
+import React from 'react'
+import { connect } from 'react-redux'
+import { RootState } from '../../redux/types'
+
+interface ReadMentoringProps {
+  profile: RedProfile
+  caption?: boolean
+}
+
+export const ProfileTags = ({ items, shortList }: CardTagsProps) => (
+  <CardTags
+    items={items}
+    shortList={shortList}
+    formatter={(item: string) => MENTORING_TOPICS_MAP[item]}
+  />
+)
+
+const ReadMentoringTopicsNew2022 = ({
+  profile,
+  caption,
+}: ReadMentoringProps) => {
+  const { mentor_mentoringTopics } = profile
+
+  if (!mentor_mentoringTopics?.length && !caption)
+    return <Placeholder>Please pick mentoring topics.</Placeholder>
+
+  return (
+    <>
+      {caption && <Caption>{'Mentoring Topics'}</Caption>}
+      <ProfileTags items={mentor_mentoringTopics} />
+    </>
+  )
+}
+
+const mapStateToProps = (state: RootState) => ({
+  profile: state.user.profile as RedProfile,
+})
+
+export default {
+  Me: connect(mapStateToProps, {})(ReadMentoringTopicsNew2022),
+  Some: ({ profile }: ReadMentoringProps) => (
+    <ReadMentoringTopicsNew2022 profile={profile} caption />
+  ),
+  Tags: ({ items, shortList }: CardTagsProps) => (
+    <ProfileTags items={items} shortList />
+  ),
+}
diff --git a/apps/redi-connect/src/components/molecules/ReadProfessionalExperienceFields.tsx b/apps/redi-connect/src/components/molecules/ReadProfessionalExperienceFields.tsx
new file mode 100644
index 000000000..f13a804a9
--- /dev/null
+++ b/apps/redi-connect/src/components/molecules/ReadProfessionalExperienceFields.tsx
@@ -0,0 +1,56 @@
+import {
+  Caption,
+  CardTags,
+  CardTagsProps,
+  Placeholder,
+} from '@talent-connect/shared-atomic-design-components'
+import { FIELDS_OF_EXPERTISE } from '@talent-connect/shared-config'
+import { RedProfile } from '@talent-connect/shared-types'
+import React from 'react'
+import { connect } from 'react-redux'
+import { RootState } from '../../redux/types'
+
+interface ReadMentoringProps {
+  profile: RedProfile
+  caption?: boolean
+}
+
+export const ProfileTags = ({ items, shortList }: CardTagsProps) => (
+  <CardTags
+    items={items}
+    shortList={shortList}
+    formatter={(item: string) => FIELDS_OF_EXPERTISE[item]}
+  />
+)
+
+const ReadProfessionalExperienceFields = ({
+  profile,
+  caption,
+}: ReadMentoringProps) => {
+  const { mentor_professionalExperienceFields: professionalExperienceFields } =
+    profile
+
+  if (!professionalExperienceFields?.length && !caption)
+    return <Placeholder>Select your fields of expertise</Placeholder>
+
+  return (
+    <>
+      {caption && <Caption>Professional experience</Caption>}
+      <ProfileTags items={professionalExperienceFields} />
+    </>
+  )
+}
+
+const mapStateToProps = (state: RootState) => ({
+  profile: state.user.profile as RedProfile,
+})
+
+export default {
+  Me: connect(mapStateToProps, {})(ReadProfessionalExperienceFields),
+  Some: ({ profile }: ReadMentoringProps) => (
+    <ReadProfessionalExperienceFields profile={profile} caption />
+  ),
+  Tags: ({ items, shortList }: CardTagsProps) => (
+    <ProfileTags items={items} shortList />
+  ),
+}
diff --git a/apps/redi-connect/src/components/organisms/EditableAbout.tsx b/apps/redi-connect/src/components/organisms/EditableAbout.tsx
index 1692471a0..e6397df05 100644
--- a/apps/redi-connect/src/components/organisms/EditableAbout.tsx
+++ b/apps/redi-connect/src/components/organisms/EditableAbout.tsx
@@ -58,6 +58,7 @@ const EditableAbout = ({ profile, profileSaveStart }: any) => {
   return (
     <Editable
       title="About You"
+      titleBold
       onSave={() => formik.handleSubmit()}
       onClose={() => formik.resetForm()}
       savePossible={formik.dirty && formik.isValid}
diff --git a/apps/redi-connect/src/components/organisms/EditableMentoringGoals.tsx b/apps/redi-connect/src/components/organisms/EditableMentoringGoals.tsx
new file mode 100644
index 000000000..70dc75f0f
--- /dev/null
+++ b/apps/redi-connect/src/components/organisms/EditableMentoringGoals.tsx
@@ -0,0 +1,138 @@
+import {
+  Checkbox,
+  Editable,
+} from '@talent-connect/shared-atomic-design-components'
+import { MENTORING_GOALS } from '@talent-connect/shared-config'
+import { RedProfile } from '@talent-connect/shared-types'
+import { objectEntries } from '@talent-connect/typescript-utilities'
+import { FormikValues, useFormik } from 'formik'
+import React from 'react'
+import { Content, Element } from 'react-bulma-components'
+import { connect } from 'react-redux'
+import * as Yup from 'yup'
+import { RootState } from '../../redux/types'
+import { profileSaveStart } from '../../redux/user/actions'
+import ReadMentoringGoals from '../molecules/ReadMentoringGoals'
+
+export interface FormValues {
+  isMentor: boolean
+  mentor_mentoringGoals: string[]
+}
+
+const formMentoringGoals = objectEntries(MENTORING_GOALS)
+
+interface Props {
+  profile: RedProfile | undefined
+  profileSaveStart: (arg0: Partial<RedProfile>) => void
+}
+
+const validationSchema = Yup.object({
+  mentoringGoals: Yup.array().min(1),
+})
+
+const EditableMentoringGoals = ({ profile, profileSaveStart }: Props) => {
+  const {
+    id,
+    userType,
+    mentor_mentoringGoals: mentoringGoals,
+  } = profile as RedProfile
+
+  const submitForm = async (values: FormikValues) => {
+    const profileMentoring = values as Partial<RedProfile>
+    profileSaveStart({ ...profileMentoring, id })
+  }
+
+  const isMentor =
+    userType === 'mentor' || userType === 'public-sign-up-mentor-pending-review'
+
+  const initialValues: FormValues = {
+    isMentor,
+    mentor_mentoringGoals: mentoringGoals || [],
+  }
+
+  const formik = useFormik({
+    initialValues,
+    enableReinitialize: true,
+    validationSchema,
+    onSubmit: submitForm,
+  })
+
+  const { mentor_mentoringGoals: selectedMentoringGoals } = formik.values
+
+  const mentoringGoalsChange = (e: any) => {
+    e.persist()
+    const value = e.target.value
+    let newMentoringGoals
+    if (e.target.checked) {
+      newMentoringGoals = selectedMentoringGoals.concat(value)
+    } else {
+      newMentoringGoals = selectedMentoringGoals.filter(
+        (cat: any) => cat !== value
+      )
+    }
+    formik.setFieldValue('mentor_mentoringGoals', newMentoringGoals)
+    formik.setFieldTouched('mentor_mentoringGoals', true, false)
+  }
+
+  return (
+    <Editable
+      title="Mentoring Goals"
+      onSave={() => formik.handleSubmit()}
+      onClose={() => formik.resetForm()}
+      savePossible={formik.dirty && formik.isValid}
+      read={<ReadMentoringGoals.Me />}
+      className="mentoring"
+    >
+      <Content>
+        Select at least one goal you would like to support mentees with
+      </Content>
+      <Element className="mentoring__group">
+        {formMentoringGoals.map(([fieldId, fieldLabel]) => (
+          <MentoringGoal
+            key={fieldId}
+            id={fieldId}
+            label={fieldLabel}
+            selectedMentoringGoals={selectedMentoringGoals}
+            onChange={mentoringGoalsChange}
+            formik={formik}
+          />
+        ))}
+      </Element>
+    </Editable>
+  )
+}
+
+const MentoringGoal = ({
+  id,
+  label,
+  selectedMentoringGoals,
+  onChange,
+  formik,
+}: any) => {
+  return (
+    <Checkbox.Form
+      name={`mentoringGoals-${id}`}
+      key={id}
+      value={id}
+      checked={selectedMentoringGoals.includes(id)}
+      customOnChange={onChange}
+      {...formik}
+    >
+      {label}
+    </Checkbox.Form>
+  )
+}
+
+const mapStateToProps = (state: RootState) => ({
+  profile: state.user.profile,
+})
+
+const mapDispatchToProps = (dispatch: any) => ({
+  profileSaveStart: (profile: Partial<RedProfile>) =>
+    dispatch(profileSaveStart(profile)),
+})
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(EditableMentoringGoals)
diff --git a/apps/redi-connect/src/components/organisms/EditableMentoringTopics.tsx b/apps/redi-connect/src/components/organisms/EditableMentoringTopics.tsx
index ae08f56c3..fb1b45e6a 100644
--- a/apps/redi-connect/src/components/organisms/EditableMentoringTopics.tsx
+++ b/apps/redi-connect/src/components/organisms/EditableMentoringTopics.tsx
@@ -121,9 +121,6 @@ const CategoryGroup = ({
   onChange,
   formik,
 }: any) => {
-  // The current REDI_LOCATION might not use the current CategoryGroup (e.g.
-  // Munich doesnt, at the time or writing, use 'coding' or 'other'. If it's the case, return null
-
   if (!categoriesByGroup[id]) return null
   return (
     <Columns.Column size={4}>
diff --git a/apps/redi-connect/src/components/organisms/EditableMentoringTopicsNew2022.tsx b/apps/redi-connect/src/components/organisms/EditableMentoringTopicsNew2022.tsx
new file mode 100644
index 000000000..fb2f1bb3a
--- /dev/null
+++ b/apps/redi-connect/src/components/organisms/EditableMentoringTopicsNew2022.tsx
@@ -0,0 +1,152 @@
+import {
+  Checkbox,
+  Editable,
+} from '@talent-connect/shared-atomic-design-components'
+import {
+  MentoringTopicKey,
+  MENTORING_TOPICS,
+  MENTORING_TOPIC_GROUPS,
+} from '@talent-connect/shared-config'
+import { RedProfile } from '@talent-connect/shared-types'
+import { objectEntries } from '@talent-connect/typescript-utilities'
+import { FormikValues, useFormik } from 'formik'
+import groupBy from 'lodash/groupBy'
+import React from 'react'
+import { Columns, Content, Element, Heading } from 'react-bulma-components'
+import { connect } from 'react-redux'
+import { RootState } from '../../redux/types'
+import { profileSaveStart } from '../../redux/user/actions'
+import ReadMentoringTopicsNew2022 from '../molecules/ReadMentoringTopicsNew2022'
+
+export type UserType =
+  | 'mentor'
+  | 'mentee'
+  | 'public-sign-up-mentor-pending-review'
+  | 'public-sign-up-mentee-pending-review'
+
+export interface FormValues {
+  mentor_mentoringTopics: MentoringTopicKey[]
+}
+
+const mentoringTopicsByGroup = groupBy(MENTORING_TOPICS, (topic) => topic.group)
+
+const formMentoringTopicGroups = objectEntries(MENTORING_TOPIC_GROUPS)
+
+interface Props {
+  profile: RedProfile | undefined
+  profileSaveStart: Function
+}
+
+const EditableMentoringTopics = ({ profile, profileSaveStart }: Props) => {
+  const { id, userType, mentor_mentoringTopics } = profile as RedProfile
+
+  const submitForm = async (values: FormikValues) => {
+    const profileMentoring = values as Partial<RedProfile>
+    profileSaveStart({ ...profileMentoring, id })
+  }
+
+  const initialValues: FormValues = {
+    mentor_mentoringTopics: mentor_mentoringTopics || [],
+  }
+
+  const formik = useFormik({
+    initialValues,
+    enableReinitialize: true,
+    onSubmit: submitForm,
+  })
+
+  const { mentor_mentoringTopics: selectedMentoringTopics } = formik.values
+
+  const mentoringTopicsChange = (e: any) => {
+    e.persist()
+    const value = e.target.value
+    let newMentoringTopics
+    if (e.target.checked) {
+      newMentoringTopics = selectedMentoringTopics.concat(value)
+    } else {
+      newMentoringTopics = selectedMentoringTopics.filter(
+        (cat: any) => cat !== value
+      )
+    }
+    formik.setFieldValue('mentor_mentoringTopics', newMentoringTopics)
+    formik.setFieldTouched('mentor_mentoringTopics', true, false)
+  }
+
+  return (
+    <Editable
+      title="Mentoring Topics"
+      onSave={() => formik.handleSubmit()}
+      onClose={() => formik.resetForm()}
+      savePossible={formik.dirty && formik.isValid}
+      read={<ReadMentoringTopicsNew2022.Me />}
+      className="mentoring"
+    >
+      <Content>
+        Select at least one topic where you would like to support mentees.
+      </Content>
+      <Columns>
+        {formMentoringTopicGroups.map(([groupId, groupLabel]) => (
+          <MentoringTopicGroup
+            key={groupId}
+            id={groupId}
+            label={groupLabel}
+            selectedMentoringTopics={selectedMentoringTopics}
+            onChange={mentoringTopicsChange}
+            formik={formik}
+          />
+        ))}
+      </Columns>
+    </Editable>
+  )
+}
+
+const MentoringTopicGroup = ({
+  id,
+  label,
+  selectedMentoringTopics,
+  onChange,
+  formik,
+}: any) => {
+  if (!mentoringTopicsByGroup[id]) return null
+  return (
+    <Columns.Column size={4}>
+      <Heading
+        size={6}
+        weight="normal"
+        renderAs="h3"
+        subtitle
+        textTransform="uppercase"
+      >
+        {label}
+      </Heading>
+      <Element className="mentoring__group">
+        {mentoringTopicsByGroup[id].map((groupItem) => (
+          <Checkbox.Form
+            name={`mentor_mentoringTopics-${groupItem.id}`}
+            key={groupItem.id}
+            value={groupItem.id}
+            checked={selectedMentoringTopics.includes(groupItem.id)}
+            customOnChange={onChange}
+            {...formik}
+          >
+            {groupItem.label}
+          </Checkbox.Form>
+        ))}
+      </Element>
+    </Columns.Column>
+  )
+}
+
+const mapStateToProps = (state: RootState) => ({
+  profile: state.user.profile,
+})
+
+const mapDispatchToProps = (dispatch: any) => ({
+  profileSaveStart: (profile: Partial<RedProfile>) =>
+    dispatch(profileSaveStart(profile)),
+})
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(EditableMentoringTopics)
diff --git a/apps/redi-connect/src/components/organisms/EditableProfessionalExperienceFields.tsx b/apps/redi-connect/src/components/organisms/EditableProfessionalExperienceFields.tsx
new file mode 100644
index 000000000..e90ccd1d2
--- /dev/null
+++ b/apps/redi-connect/src/components/organisms/EditableProfessionalExperienceFields.tsx
@@ -0,0 +1,140 @@
+import {
+  Checkbox,
+  Editable,
+} from '@talent-connect/shared-atomic-design-components'
+import { FIELDS_OF_EXPERTISE } from '@talent-connect/shared-config'
+import { RedProfile } from '@talent-connect/shared-types'
+import { objectEntries } from '@talent-connect/typescript-utilities'
+import { FormikValues, useFormik } from 'formik'
+import React from 'react'
+import { Content, Element } from 'react-bulma-components'
+import { connect } from 'react-redux'
+import { RootState } from '../../redux/types'
+import { profileSaveStart } from '../../redux/user/actions'
+import { ReadMentoringTopics } from '../molecules'
+import ReadProfessionalExperienceFields from '../molecules/ReadProfessionalExperienceFields'
+
+export interface FormValues {
+  isMentor: boolean
+  mentor_professionalExperienceFields: string[]
+}
+
+const formProfessionalExperienceFields = objectEntries(FIELDS_OF_EXPERTISE)
+
+interface Props {
+  profile: RedProfile | undefined
+  profileSaveStart: Function
+}
+
+const EditableProfessionalExperienceFields = ({
+  profile,
+  profileSaveStart,
+}: Props) => {
+  const {
+    id,
+    userType,
+    mentor_professionalExperienceFields: professionalExperienceFields,
+  } = profile as RedProfile
+
+  const submitForm = async (values: FormikValues) => {
+    const profileMentoring = values as Partial<RedProfile>
+    profileSaveStart({ ...profileMentoring, id })
+  }
+
+  const isMentor =
+    userType === 'mentor' || userType === 'public-sign-up-mentor-pending-review'
+
+  const initialValues: FormValues = {
+    isMentor,
+    mentor_professionalExperienceFields: professionalExperienceFields || [],
+  }
+
+  const formik = useFormik({
+    initialValues,
+    enableReinitialize: true,
+    onSubmit: submitForm,
+  })
+
+  const { mentor_professionalExperienceFields: selectedProfessionalExperienceFields } =
+    formik.values
+
+  const professionalExperienceFieldsChange = (e: any) => {
+    e.persist()
+    const value = e.target.value
+    let newProfessionalExperienceFields
+    if (e.target.checked) {
+      newProfessionalExperienceFields =
+        selectedProfessionalExperienceFields.concat(value)
+    } else {
+      newProfessionalExperienceFields =
+        selectedProfessionalExperienceFields.filter((cat: any) => cat !== value)
+    }
+    formik.setFieldValue(
+      'mentor_professionalExperienceFields',
+      newProfessionalExperienceFields
+    )
+    formik.setFieldTouched('mentor_professionalExperienceFields', true, false)
+  }
+
+  return (
+    <Editable
+      title="Professional experience"
+      onSave={() => formik.handleSubmit()}
+      onClose={() => formik.resetForm()}
+      savePossible={formik.dirty && formik.isValid}
+      read={<ReadProfessionalExperienceFields.Me />}
+      className="mentoring"
+    >
+      <Content>Select your fields of expertise</Content>
+      <Element className="mentoring__group">
+        {formProfessionalExperienceFields.map(([fieldId, fieldLabel]) => (
+          <ProfessionalExperienceField
+            key={fieldId}
+            id={fieldId}
+            label={fieldLabel}
+            selectedProfessionalExperienceFields={
+              selectedProfessionalExperienceFields
+            }
+            onChange={professionalExperienceFieldsChange}
+            formik={formik}
+          />
+        ))}
+      </Element>
+    </Editable>
+  )
+}
+
+const ProfessionalExperienceField = ({
+  id,
+  label,
+  selectedProfessionalExperienceFields,
+  onChange,
+  formik,
+}: any) => {
+  return (
+    <Checkbox.Form
+      name={`professionalExperienceFields-${id}`}
+      key={id}
+      value={id}
+      checked={selectedProfessionalExperienceFields.includes(id)}
+      customOnChange={onChange}
+      {...formik}
+    >
+      {label}
+    </Checkbox.Form>
+  )
+}
+
+const mapStateToProps = (state: RootState) => ({
+  profile: state.user.profile,
+})
+
+const mapDispatchToProps = (dispatch: any) => ({
+  profileSaveStart: (profile: Partial<RedProfile>) =>
+    dispatch(profileSaveStart(profile)),
+})
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(EditableProfessionalExperienceFields)
diff --git a/apps/redi-connect/src/components/organisms/ProfileCard.tsx b/apps/redi-connect/src/components/organisms/ProfileCard.tsx
index b615b6788..869d70055 100644
--- a/apps/redi-connect/src/components/organisms/ProfileCard.tsx
+++ b/apps/redi-connect/src/components/organisms/ProfileCard.tsx
@@ -7,6 +7,8 @@ import { useHistory } from 'react-router-dom'
 import {
   AWS_PROFILE_AVATARS_BUCKET_BASE_URL,
   REDI_LOCATION_NAMES,
+  FIELDS_OF_EXPERTISE,
+  MENTORING_TOPICS_MAP,
 } from '@talent-connect/shared-config'
 
 import placeholderImage from '../../assets/images/img-placeholder.png'
@@ -30,15 +32,23 @@ const ProfileCard = ({
 }: ProfileCardProps) => {
   const history = useHistory()
 
-  const {
+  let {
     firstName,
     lastName,
     languages,
-    categories,
+    mentor_mentoringTopics,
+    mentor_professionalExperienceFields,
     rediLocation,
     profileAvatarImageS3Key,
   } = profile
 
+  const mentoringTopics =
+    mentor_mentoringTopics?.map((topic) => MENTORING_TOPICS_MAP[topic]) ?? []
+  const professionalExperienceFields =
+    mentor_professionalExperienceFields?.map(
+      (field) => FIELDS_OF_EXPERTISE[field]
+    ) ?? []
+
   const handleFavorite = (e: React.MouseEvent) => {
     e.stopPropagation()
     toggleFavorite && toggleFavorite(profile.id)
@@ -82,9 +92,19 @@ const ProfileCard = ({
           {REDI_LOCATION_NAMES[rediLocation]}
         </Element>
         {languages && <PipeList items={languages} />}
-        {categories && (
-          <ReadMentoringTopics.Tags items={categories} shortList />
-        )}
+        <p style={{ fontSize: 'smaller' }}>
+          <strong>
+            Mentors in these overarching topics, role-related skills and
+            tools/frameworks:
+          </strong>
+          {mentoringTopics?.length > 0 ? mentoringTopics.join(' | ') : null}
+        </p>
+        <p style={{ fontSize: 'smaller' }}>
+          <strong>Has professional experience in these fields:</strong>
+          {professionalExperienceFields?.length > 0
+            ? professionalExperienceFields.join(' | ')
+            : null}
+        </p>
       </Card.Content>
     </Card>
   )
diff --git a/apps/redi-connect/src/components/templates/LoggedIn.tsx b/apps/redi-connect/src/components/templates/LoggedIn.tsx
index 353104285..1499981c2 100644
--- a/apps/redi-connect/src/components/templates/LoggedIn.tsx
+++ b/apps/redi-connect/src/components/templates/LoggedIn.tsx
@@ -24,6 +24,7 @@ import {
 import { useTranslation } from 'react-i18next'
 import Footer from '../organisms/Footer'
 import { RedMatch } from '@talent-connect/shared-types'
+import { ensureMenteeProfileIsComplete } from '../../../../redi-connect/src/pages/app/find-a-mentor/utils'
 
 interface Props {
   loading: boolean
@@ -72,6 +73,8 @@ const LoggedIn = ({
     history.push(`/app/mentorships/${redMatchId}`)
   }
 
+  const isMenteeProfileComplete = ensureMenteeProfileIsComplete(profile)
+
   return (
     <>
       <Navbar />
@@ -96,6 +99,11 @@ const LoggedIn = ({
                   {t('loggedInArea.profile.notification.pendingMentor')}
                 </RediNotification>
               )}
+              {profile.userType === 'mentee' && !isMenteeProfileComplete && (
+                <RediNotification>
+                  {t('loggedInArea.profile.notification.missingMentoringGoal')}
+                </RediNotification>
+              )}
               {profile.userType === 'mentee' && !profile.userActivated && (
                 <RediNotification>
                   {t('loggedInArea.profile.notification.deactivatedMentee', {
diff --git a/apps/redi-connect/src/pages/app/applications/Applications.tsx b/apps/redi-connect/src/pages/app/applications/Applications.tsx
index ea98e8bee..df3385b06 100644
--- a/apps/redi-connect/src/pages/app/applications/Applications.tsx
+++ b/apps/redi-connect/src/pages/app/applications/Applications.tsx
@@ -9,6 +9,7 @@ import { connect } from 'react-redux'
 import { RedMatch } from '@talent-connect/shared-types'
 import { useHistory } from 'react-router-dom'
 import { getRedProfileFromLocalStorage } from '../../../services/auth/auth'
+import { ensureMenteeProfileIsComplete } from '../find-a-mentor/utils'
 
 interface Props {
   applicants: RedMatch[]
@@ -18,7 +19,13 @@ function Applications({ applicants }: Props) {
   const history = useHistory()
   const profile = getRedProfileFromLocalStorage()
 
-  if (profile.userActivated !== true) return <LoggedIn />
+  const isMenteeProfileComplete = ensureMenteeProfileIsComplete(profile)
+
+  if (
+    profile.userActivated !== true ||
+    (profile.userType === 'mentee' && !isMenteeProfileComplete)
+  )
+    return <LoggedIn />
 
   return (
     <LoggedIn>
diff --git a/apps/redi-connect/src/pages/app/find-a-mentor/FindAMentor.tsx b/apps/redi-connect/src/pages/app/find-a-mentor/FindAMentor.tsx
index 33480800c..9152bdee7 100644
--- a/apps/redi-connect/src/pages/app/find-a-mentor/FindAMentor.tsx
+++ b/apps/redi-connect/src/pages/app/find-a-mentor/FindAMentor.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react'
 import { Content, Columns, Tag, Form } from 'react-bulma-components'
-import { debounce } from 'lodash'
+import { debounce, values } from 'lodash'
 import {
   Heading,
   Icon,
@@ -16,9 +16,20 @@ import { connect } from 'react-redux'
 import { RootState } from '../../../redux/types'
 import { LoggedIn } from '../../../components/templates'
 
-import { CATEGORIES, REDI_LOCATION_NAMES } from '@talent-connect/shared-config'
+import {
+  CATEGORIES,
+  Language,
+  MentoringGoalKey,
+  DesiredRolesKey,
+  MentoringTopicKey,
+  REDI_LOCATION_NAMES,
+  MENTORING_TOPICS,
+  MENTORING_TOPICS_MAP,
+  FIELDS_OF_EXPERTISE,
+  FieldOfExperienceKey,
+} from '@talent-connect/shared-config'
 import './FindAMentor.scss'
-import { toggleValueInArray } from './utils'
+import { toggleValueInArray, ensureMenteeProfileIsComplete } from './utils'
 import {
   StringParam,
   useQueryParams,
@@ -28,63 +39,45 @@ import {
 } from 'use-query-params'
 import { objectKeys } from '@talent-connect/typescript-utilities'
 
-const filterCategories = CATEGORIES.map((category) => ({
-  value: category.id,
-  label: category.label,
-}))
-
-interface FilterTagProps {
-  id: string
-  label: string
-  onClickHandler: (item: string) => void
-}
-
-const FilterTag = ({ id, label, onClickHandler }: FilterTagProps) => (
-  <Tag size="medium" rounded textWeight="bold">
-    {label}
-    <Icon
-      icon="cancel"
-      onClick={() => {
-        onClickHandler(id)
-      }}
-      className="active-filters__remove"
-    />
-  </Tag>
-)
-
 interface FindAMentorProps {
   profile: RedProfile
   profileSaveStart: (profile: Partial<RedProfile>) => void
 }
 
-const FindAMentor = ({ profile, profileSaveStart }: FindAMentorProps) => {
+function FindAMentor({ profile, profileSaveStart }: FindAMentorProps) {
+  profile = ensureNoUndefinedArrayPropertiesInProfile(profile)
   const { Loading, isLoading, setLoading } = useLoading()
-  const {
-    id,
-    categories: categoriesFromProfile,
-    favouritedRedProfileIds,
-    rediLocation,
-  } = profile
-  const [showFavorites, setShowFavorites] = useState<boolean>(false)
-  const [mentors, setMentors] = useState<RedProfile[]>([])
-  const [query, setQuery] = useQueryParams({
-    name: withDefault(StringParam, undefined),
-    topics: withDefault(ArrayParam, []),
-    languages: withDefault(ArrayParam, []),
-    locations: withDefault(ArrayParam, []),
+  const [allFetchedMentors, setAllFetchedMentors] = useState<RedProfile[]>([])
+  const [queryParams, setQuery] = useQueryParams({
+    nameQuery: withDefault(StringParam, undefined),
     onlyFavorites: withDefault(BooleanParam, undefined),
+    mentoringTopics: withDefault(ArrayParam, []),
+    mentoringTopicsToolsAndFrameworks: withDefault(ArrayParam, []),
+    locations: withDefault(ArrayParam, []),
+    roles: withDefault(ArrayParam, []),
   })
-  const { topics, name, languages, locations, onlyFavorites } = query
+
+  const nameQuery = queryParams.nameQuery
+  const onlyFavorites = queryParams.onlyFavorites
+  const mentoringTopics =
+    queryParams.mentoringTopics as Array<MentoringTopicKey>
+  const mentoringTopicsToolsAndFrameworks =
+    queryParams.mentoringTopicsToolsAndFrameworks as Array<MentoringTopicKey>
+  const locations = queryParams.locations
+  const roles = queryParams.roles
 
   useEffect(() => {
-    const hasQuery =
-      topics.length > 0 ||
-      languages.length > 0 ||
-      locations.length > 0 ||
-      Boolean(name) ||
-      onlyFavorites
-    setQuery(hasQuery ? query : { ...query, topics: categoriesFromProfile })
-  }, [])
+    setLoading(true)
+    getMentors({
+      nameQuery: nameQuery ?? '',
+    }).then((mentors) => {
+      setAllFetchedMentors(ensureNoUndefinedArrayPropertiesInProfiles(mentors))
+      setLoading(false)
+    })
+  }, [nameQuery])
+
+  const { id, favouritedRedProfileIds, rediLocation } = profile
+  const [showFavorites, setShowFavorites] = useState<boolean>(false)
 
   const toggleFilters = (filtersArr, filterName, item) => {
     const newFilters = toggleValueInArray(filtersArr, item)
@@ -92,7 +85,10 @@ const FindAMentor = ({ profile, profileSaveStart }: FindAMentorProps) => {
   }
 
   const setName = (value) => {
-    setQuery((latestQuery) => ({ ...latestQuery, name: value || undefined }))
+    setQuery((latestQuery) => ({
+      ...latestQuery,
+      nameQuery: value || undefined,
+    }))
   }
 
   const toggleFavorites = (favoritesArr, value) => {
@@ -113,141 +109,173 @@ const FindAMentor = ({ profile, profileSaveStart }: FindAMentorProps) => {
   const clearFilters = () => {
     setQuery((latestQuery) => ({
       ...latestQuery,
-      topics: [],
-      languages: [],
+      mentoringTopics: [],
+      mentoringTopicsToolsAndFrameworks: [],
       locations: [],
+      roles: [],
     }))
   }
 
-  const filterLanguages = Array.from(
-    new Set(
-      mentors
-        .map((mentor) => mentor.languages || [])
-        .flat()
-        .sort()
+  const isMenteeProfileComplete = ensureMenteeProfileIsComplete(profile)
+
+  if (profile.userActivated !== true || !isMenteeProfileComplete)
+    return <LoggedIn />
+
+  const eligibleMentors = allFetchedMentors
+    .filter((mentor) => mentor.currentFreeMenteeSpots > 0)
+    .filter(
+      (mentor) =>
+        !mentor.optOutOfMenteesFromOtherRediLocation ||
+        mentor.rediLocation === rediLocation
     )
-  ).map((language) => ({
-    value: language,
-    label: language,
-  }))
-
-  const filterRediLocations = objectKeys(REDI_LOCATION_NAMES).map(
-    (location) => ({
-      value: location,
-      label: REDI_LOCATION_NAMES[location as RediLocation] as string,
-    })
-  )
 
-  useEffect(() => {
-    setLoading(true)
-    getMentors({
-      categories: topics,
-      languages,
-      nameQuery: name || '',
-      locations,
-    }).then((mentors) => {
-      setMentors(
-        mentors
-          .filter((mentor) => mentor.currentFreeMenteeSpots > 0)
-          .filter(
-            (mentor) =>
-              !mentor.optOutOfMenteesFromOtherRediLocation ||
-              mentor.rediLocation === rediLocation
-          )
-      )
-      setLoading(false)
-    })
-  }, [topics, languages, locations, name])
+  const mentorGroups = filterGroupRankMentors(eligibleMentors, {
+    menteeDesiredRoles: [
+      profile.mentee_primaryRole_fieldOfExpertise,
+      profile.mentee_secondaryRole_fieldOfExpertise,
+    ],
+    menteeLanguages: profile.languages,
+    menteeMentoringGoal: profile.mentee_mentoringGoal,
+    menteePrimaryRoleMentoringTopics:
+      profile.mentee_primaryRole_mentoringTopics,
+    menteeSecondaryRoleMentoringTopics:
+      profile.mentee_secondaryRole_mentoringTopics,
+    menteeToolsAndFrameworksTopics:
+      profile.mentee_toolsAndFrameworks_mentoringTopics,
 
-  if (profile.userActivated !== true) return <LoggedIn />
+    chosenMentoringTopics: mentoringTopics,
+    chosenToolsAndFrameworks: mentoringTopicsToolsAndFrameworks,
+    chosenLocations: locations as Array<RediLocation>,
+    chosedDesiredRoles: roles as Array<FieldOfExperienceKey>,
+
+    favoritedMentorsEnabled: showFavorites,
+    favoritedMentors: favouritedRedProfileIds,
+  })
+
+  const mentorCount =
+    mentorGroups.bestMatchMentors.length + mentorGroups.otherMentors.length
 
   return (
     <LoggedIn>
       <Loading />
       <Heading subtitle size="small" className="oneandhalf-bs">
-        Available mentors ({mentors.length})
+        Available mentors ({mentorCount})
       </Heading>
       <div className="filters">
-        <SearchField
-          defaultValue={name}
-          valueChange={setName}
-          placeholder="Search by name"
-        />
+        <div className="filters-wrapper">
+          <SearchField
+            defaultValue={nameQuery}
+            valueChange={setName}
+            placeholder="Search by name"
+          />
+        </div>
+
+        <div className="filter-favourites" onClick={setFavorites}>
+          <Icon
+            icon={showFavorites ? 'heartFilled' : 'heart'}
+            className="filter-favourites__icon"
+            space="right"
+          />
+          Only Favorites
+        </div>
       </div>
       <div className="filters">
         <div className="filters-wrapper">
           <FilterDropdown
-            items={filterCategories}
+            items={filterItemsMentoringTopics}
             className="filters__dropdown"
             label="Topics"
-            selected={topics}
-            onChange={(item) => toggleFilters(topics, 'topics', item)}
+            selected={mentoringTopics}
+            onChange={(item) =>
+              toggleFilters(mentoringTopics, 'mentoringTopics', item)
+            }
           />
         </div>
-        <div className="filters-inner">
+        <div className="filters-wrapper">
           <FilterDropdown
-            items={filterLanguages}
+            items={filterItemsToolsAndFrameworks}
             className="filters__dropdown"
-            label="Languages"
-            selected={languages}
-            onChange={(item) => toggleFilters(languages, 'languages', item)}
+            label="Tools and Frameworks"
+            selected={mentoringTopicsToolsAndFrameworks}
+            onChange={(item) =>
+              toggleFilters(
+                mentoringTopicsToolsAndFrameworks,
+                'mentoringTopicsToolsAndFrameworks',
+                item
+              )
+            }
           />
-          <div className="filter-favourites" onClick={setFavorites}>
-            <Icon
-              icon={showFavorites ? 'heartFilled' : 'heart'}
-              className="filter-favourites__icon"
-              space="right"
-            />
-            Only Favorites
-          </div>
         </div>
-      </div>
-      <div className="active-filters">
-        <div className="location-filter-wrapper">
+        <div className="filters-wrapper">
           <FilterDropdown
-            items={filterRediLocations}
+            items={filterItemsLocations}
             className="filters__dropdown"
             label="Location"
             selected={locations}
             onChange={(item) => toggleFilters(locations, 'locations', item)}
           />
         </div>
-
-        {(topics.length !== 0 ||
-          languages.length !== 0 ||
-          locations.length !== 0) && (
+      </div>
+      <div className="filters">
+        <div className="filters-wrapper">
+          <FilterDropdown
+            items={filterItemsRoles}
+            className="filters__dropdown"
+            label="Roles"
+            selected={roles}
+            onChange={(item) => toggleFilters(roles, 'roles', item)}
+          />
+        </div>
+      </div>
+      <div className="active-filters">
+        {(mentoringTopics.length !== 0 ||
+          mentoringTopicsToolsAndFrameworks.length !== 0 ||
+          locations.length !== 0 ||
+          roles.length !== 0) && (
           <>
-            {(topics as string[]).map((catId) => (
+            {(mentoringTopics as string[]).map((id) => (
+              <FilterTag
+                key={id}
+                id={id}
+                label={MENTORING_TOPICS_MAP[id]}
+                onClickHandler={(item) =>
+                  toggleFilters(mentoringTopics, 'mentoringTopics', item)
+                }
+              />
+            ))}
+            {(mentoringTopicsToolsAndFrameworks as string[]).map((id) => (
               <FilterTag
-                key={catId}
-                id={catId}
-                label={CATEGORIES.find((item) => item.id === catId).label}
-                onClickHandler={(item) => toggleFilters(topics, 'topics', item)}
+                key={id}
+                id={id}
+                label={MENTORING_TOPICS_MAP[id]}
+                onClickHandler={(item) =>
+                  toggleFilters(
+                    mentoringTopicsToolsAndFrameworks,
+                    'mentoringTopicsToolsAndFrameworks',
+                    item
+                  )
+                }
               />
             ))}
-            {(languages as string[]).map((langId) => (
+            {(locations as string[]).map((id) => (
               <FilterTag
-                key={langId}
-                id={langId}
-                label={langId}
+                key={id}
+                id={id}
+                label={REDI_LOCATION_NAMES[id]}
                 onClickHandler={(item) =>
-                  toggleFilters(languages, 'languages', item)
+                  toggleFilters(locations, 'locations', item)
                 }
               />
             ))}
-            {(locations as RediLocation[]).map(
-              (locId) =>
-                locId && (
-                  <FilterTag
-                    key={locId}
-                    id={locId}
-                    label={REDI_LOCATION_NAMES[locId as RediLocation] as string}
-                    onClickHandler={(item) =>
-                      toggleFilters(locations, 'locations', item)
-                    }
-                  />
-                )
-            )}
+            {(roles as string[]).map((id) => (
+              <FilterTag
+                key={id}
+                id={id}
+                label={FIELDS_OF_EXPERTISE[id]}
+                onClickHandler={(item) => toggleFilters(roles, 'roles', item)}
+              />
+            ))}
+
             <span className="active-filters__clear-all" onClick={clearFilters}>
               Delete all filters
               <Icon icon="cancel" size="small" space="left" />
@@ -256,28 +284,7 @@ const FindAMentor = ({ profile, profileSaveStart }: FindAMentorProps) => {
         )}
       </div>
 
-      <Columns>
-        {mentors.map((mentor: RedProfile) => {
-          const isFavorite = favouritedRedProfileIds.includes(mentor.id)
-
-          if (!isFavorite && showFavorites) return
-
-          return (
-            <Columns.Column size={4} key={mentor.id}>
-              <ProfileCard
-                profile={mentor}
-                linkTo={`/app/find-a-mentor/profile/${mentor.id}`}
-                toggleFavorite={(item) =>
-                  toggleFavorites(favouritedRedProfileIds, item)
-                }
-                isFavorite={isFavorite}
-              />
-            </Columns.Column>
-          )
-        })}
-      </Columns>
-
-      {mentors.length === 0 && !isLoading && (
+      {mentorCount === 0 && !isLoading && (
         <Content>
           <>
             Unfortunately <strong>could not find any mentors</strong> matching
@@ -285,6 +292,44 @@ const FindAMentor = ({ profile, profileSaveStart }: FindAMentorProps) => {
           </>
         </Content>
       )}
+      {mentorCount > 0 && (
+        <>
+          <h3 style={{ fontSize: '20pt' }}>
+            Best Matches ({mentorGroups.bestMatchMentors.length})
+          </h3>
+          <Columns>
+            {mentorGroups.bestMatchMentors.map((mentor: RedProfile) => (
+              <Columns.Column size={4} key={mentor.id}>
+                <ProfileCard
+                  profile={mentor}
+                  linkTo={`/app/find-a-mentor/profile/${mentor.id}`}
+                  toggleFavorite={(item) =>
+                    toggleFavorites(favouritedRedProfileIds, item)
+                  }
+                  isFavorite={favouritedRedProfileIds.includes(mentor.id)}
+                />
+              </Columns.Column>
+            ))}
+          </Columns>
+          <h3 style={{ fontSize: '20pt' }}>
+            All mentors ({mentorGroups.otherMentors.length})
+          </h3>
+          <Columns>
+            {mentorGroups.otherMentors.map((mentor: RedProfile) => (
+              <Columns.Column size={4} key={mentor.id}>
+                <ProfileCard
+                  profile={mentor}
+                  linkTo={`/app/find-a-mentor/profile/${mentor.id}`}
+                  toggleFavorite={(item) =>
+                    toggleFavorites(favouritedRedProfileIds, item)
+                  }
+                  isFavorite={favouritedRedProfileIds.includes(mentor.id)}
+                />
+              </Columns.Column>
+            ))}
+          </Columns>
+        </>
+      )}
     </LoggedIn>
   )
 }
@@ -297,3 +342,226 @@ const mapDispatchToProps = (dispatch: any) => ({
     dispatch(profileSaveStart(profile)),
 })
 export default connect(mapStateToProps, mapDispatchToProps)(FindAMentor)
+
+const filterItemsMentoringTopics = MENTORING_TOPICS.filter(
+  ({ group }) => group !== 'toolsAndFrameworks'
+).map((category) => ({
+  value: category.id,
+  label: category.label,
+}))
+const filterItemsToolsAndFrameworks = MENTORING_TOPICS.filter(
+  ({ group }) => group === 'toolsAndFrameworks'
+).map((category) => ({
+  value: category.id,
+  label: category.label,
+}))
+const filterItemsLocations = Object.entries(REDI_LOCATION_NAMES).map(
+  ([value, label]) => ({ value, label })
+)
+const filterItemsRoles = Object.entries(FIELDS_OF_EXPERTISE).map(
+  ([value, label]) => ({ value, label })
+)
+
+interface FilterTagProps {
+  id: string
+  label: string
+  onClickHandler: (item: string) => void
+}
+
+const FilterTag = ({ id, label, onClickHandler }: FilterTagProps) => (
+  <Tag size="medium" rounded textWeight="bold">
+    {label}
+    <Icon
+      icon="cancel"
+      onClick={() => {
+        onClickHandler(id)
+      }}
+      className="active-filters__remove"
+    />
+  </Tag>
+)
+
+interface FilteredMentors {
+  bestMatchMentors: RedProfile[]
+  otherMentors: RedProfile[]
+}
+interface FiltersValues {
+  menteeLanguages: Array<Language>
+  menteeMentoringGoal: MentoringGoalKey
+  menteeDesiredRoles: Array<DesiredRolesKey>
+  menteePrimaryRoleMentoringTopics: Array<MentoringTopicKey>
+  menteeSecondaryRoleMentoringTopics: Array<MentoringTopicKey>
+  menteeToolsAndFrameworksTopics: Array<MentoringTopicKey>
+
+  chosenMentoringTopics: Array<MentoringTopicKey>
+  chosenToolsAndFrameworks: Array<MentoringTopicKey>
+  chosenLocations: Array<RediLocation>
+  chosedDesiredRoles: Array<FieldOfExperienceKey>
+
+  favoritedMentorsEnabled: boolean
+  favoritedMentors: string[]
+}
+
+const filterGroupRankMentors = (
+  mentors: RedProfile[],
+  filters: FiltersValues
+): FilteredMentors => {
+  const filterFns = curriedFilterFunctions(filters)
+  const displayableMentors = mentors
+    .filter(filterFns.favorites)
+    .filter(filterFns.chosenMentoringTopics)
+    .filter(filterFns.chosenToolsAndFrameworks)
+    .filter(filterFns.chosenLocations)
+    .filter(filterFns.chosenDesiredRoles)
+    .filter(filterFns.mentorSharesLanguageWithMentee)
+    .filter(filterFns.menteeMentoringGoalCompatibleWithMentor)
+
+  const groupedMentors = {
+    bestMatchMentors: [] as Array<RedProfile>,
+    otherMentors: [] as Array<RedProfile>,
+  }
+
+  for (const mentor of displayableMentors) {
+    if (filterFns.isBestMatchMentor(mentor))
+      groupedMentors.bestMatchMentors.push(mentor)
+    else groupedMentors.otherMentors.push(mentor)
+  }
+
+  return groupedMentors
+}
+
+const curriedFilterFunctions = (filters: FiltersValues) => {
+  const allMenteeRoleMentoringTopics = [
+    ...filters.menteePrimaryRoleMentoringTopics,
+    ...filters.menteeSecondaryRoleMentoringTopics,
+  ]
+
+  return {
+    favorites(mentor: RedProfile) {
+      if (!filters.favoritedMentorsEnabled) return true
+      return filters.favoritedMentors.includes(mentor.id)
+    },
+    chosenMentoringTopics(mentor: RedProfile) {
+      if (filters.chosenMentoringTopics.length === 0) return true
+      return mentor.mentor_mentoringTopics.some((topic) =>
+        filters.chosenMentoringTopics.includes(topic)
+      )
+    },
+    chosenToolsAndFrameworks(mentor: RedProfile) {
+      if (filters.chosenToolsAndFrameworks.length === 0) return true
+      return mentor.mentor_mentoringTopics.some((topic) =>
+        filters.chosenToolsAndFrameworks.includes(topic)
+      )
+    },
+    chosenLocations(mentor: RedProfile) {
+      if (filters.chosenLocations.length === 0) return true
+      return filters.chosenLocations.includes(mentor.rediLocation)
+    },
+    chosenDesiredRoles(mentor: RedProfile) {
+      if (filters.chosedDesiredRoles.length === 0) return true
+      return mentor.mentor_professionalExperienceFields.some((field) =>
+        filters.chosedDesiredRoles.includes(field)
+      )
+    },
+    mentorSharesLanguageWithMentee(mentor: RedProfile) {
+      return (
+        mentor.languages.some((lang) =>
+          filters.menteeLanguages.includes(lang)
+        ) || []
+      )
+    },
+    menteeMentoringGoalCompatibleWithMentor(mentor: RedProfile) {
+      switch (filters.menteeMentoringGoal) {
+        /**
+         * When mentee has one of the following goals from a mentorship,
+         * we filter the mentors with relevant professional experience with mentee's
+         * desired roles
+         */
+        case 'tutoringInAParticularSkillTool':
+        case 'preparationForACertificationInterview':
+        case 'careerOrientatioPlanning':
+          if (
+            !mentor.mentor_professionalExperienceFields.some((field) =>
+              filters.menteeDesiredRoles.includes(field)
+            )
+          )
+            return false
+
+        /**
+         * If the mentee has Primary or Secondary Skills selected, we match those
+         * with the mentor's mentoringTopics to filter mentors. If they are not selected
+         * we don't filter.
+         */
+        case 'tutoringInAParticularSkillTool':
+        case 'preparationForACertificationInterview':
+          if (
+            allMenteeRoleMentoringTopics.length > 0 &&
+            !allMenteeRoleMentoringTopics.some((topic) =>
+              mentor.mentor_mentoringTopics.includes(topic)
+            )
+          )
+            return false
+
+        default:
+          return true
+      }
+    },
+    isBestMatchMentor(mentor: RedProfile) {
+      switch (filters.menteeMentoringGoal) {
+        case 'tutoringInAParticularSkillTool':
+        case 'preparationForACertificationInterview':
+          return filters.menteeToolsAndFrameworksTopics.some((topic) =>
+            mentor.mentor_mentoringTopics.includes(topic)
+          )
+
+        case 'careerOrientatioPlanning':
+          return allMenteeRoleMentoringTopics.some((topic) =>
+            mentor.mentor_mentoringTopics.includes(topic)
+          )
+
+        case 'jobSearchAndApplicationProcess':
+        case 'buildingAProfessionalNetwork':
+        case 'entrepreneurshipAndFreelancing':
+          return allMenteeRoleMentoringTopics.some((topic) =>
+            mentor.mentor_mentoringTopics.includes(topic)
+          )
+
+        default:
+          // Exhaustiveness check: we should never hit this clause
+          throw new Error(
+            `Unexpected mentee mentoring goal: ${filters.menteeMentoringGoal}`
+          )
+      }
+    },
+  }
+}
+
+function ensureNoUndefinedArrayPropertiesInProfile(mentor: RedProfile) {
+  const keys = [
+    'languages',
+    'categories',
+    'favouritedRedProfileIds',
+    'mentor_mentoringTopics',
+    'mentor_mentoringGoals',
+    'mentor_professionalExperienceFields',
+    'mentee_mentoringGoal',
+    'mentee_overarchingMentoringTopics',
+    'mentee_primaryRole_mentoringTopics',
+    'mentee_secondaryRole_mentoringTopics',
+    'mentee_toolsAndFrameworks_mentoringTopics',
+  ]
+
+  keys.forEach((key) => {
+    if (mentor[key] === undefined) {
+      mentor[key] = []
+    }
+  })
+
+  return mentor
+}
+
+function ensureNoUndefinedArrayPropertiesInProfiles(mentors: RedProfile[]) {
+  const fixedMentors = mentors.map(ensureNoUndefinedArrayPropertiesInProfile)
+
+  return fixedMentors
+}
diff --git a/apps/redi-connect/src/pages/app/find-a-mentor/utils.ts b/apps/redi-connect/src/pages/app/find-a-mentor/utils.ts
index 5c2d5363c..0455a27b3 100644
--- a/apps/redi-connect/src/pages/app/find-a-mentor/utils.ts
+++ b/apps/redi-connect/src/pages/app/find-a-mentor/utils.ts
@@ -1,4 +1,19 @@
+import { RedProfile } from '@talent-connect/shared-types'
+
 export function toggleValueInArray<T>(array: Array<T>, value: T) {
   if (array.includes(value)) return array.filter((val) => val !== value)
   else return [...array, value]
 }
+
+// Fix for newly registered mentee users:
+// Ensuring that a mentee filled their profile with required information before displaying list of mentors
+const isString = (value: any) => typeof value === 'string'
+const isFulfilledString = (string: any) => isString(string) && string.length > 0
+
+const arrayIsNotEmpty = (array: any) => Array.isArray(array) && array.length > 0
+const isObjectValueFulfilled = (objectValue: any) => arrayIsNotEmpty(objectValue) || isFulfilledString(objectValue)
+
+export const ensureMenteeProfileIsComplete = ({ mentee_mentoringGoal, mentee_primaryRole_fieldOfExpertise }: RedProfile) => {
+  const isMenteeProfileComplete = isObjectValueFulfilled(mentee_mentoringGoal) && isObjectValueFulfilled(mentee_primaryRole_fieldOfExpertise)
+  return isMenteeProfileComplete
+}
diff --git a/apps/redi-connect/src/pages/app/me/Me.tsx b/apps/redi-connect/src/pages/app/me/Me.tsx
index 381370e07..3467ac70a 100644
--- a/apps/redi-connect/src/pages/app/me/Me.tsx
+++ b/apps/redi-connect/src/pages/app/me/Me.tsx
@@ -1,28 +1,10 @@
+import { Loader } from '@talent-connect/shared-atomic-design-components'
 import React, { useEffect } from 'react'
 import { connect } from 'react-redux'
 import { RootState } from '../../../redux/types'
 import { profileFetchStart } from '../../../redux/user/actions'
-import { Columns, Content, Element } from 'react-bulma-components'
-import {
-  Heading,
-  Loader,
-} from '@talent-connect/shared-atomic-design-components'
-import {
-  Avatar,
-  EditableAbout,
-  EditableContactDetails,
-  EditableEducation,
-  EditableLanguages,
-  EditableMentoringTopics,
-  EditableOccupation,
-  EditablePersonalDetail,
-  EditableRediClass,
-  EditableSocialMedia,
-  EditableMenteeCount,
-} from '../../../components/organisms'
-
-import { LoggedIn } from '../../../components/templates'
-// CHECK OUT THE LOADER
+import MeMenteeProfile from './me-mentee-profile/MeMenteeProfile'
+import MeMentorProfile from './MeMentorProfile'
 
 const Me = ({ loading, saveResult, profileFetchStart, profile }: any) => {
   useEffect(() => {
@@ -40,104 +22,10 @@ const Me = ({ loading, saveResult, profileFetchStart, profile }: any) => {
     profile.userType === 'public-sign-up-mentor-pending-review'
 
   return (
-    <LoggedIn>
-      {saveResult === 'error' && <>An error occurred, please try again.</>}
-      {saveResult === 'submitting' && <Loader loading={true} />}
-
-      <Columns vCentered breakpoint="mobile" className="oneandhalf-bs">
-        <Columns.Column size={3}>
-          <Avatar.Editable />
-        </Columns.Column>
-        <Columns.Column size={8}>
-          <Heading>Hi, {profile.firstName}</Heading>
-          <Content
-            size="medium"
-            renderAs="p"
-            responsive={{ mobile: { hide: { value: true } } }}
-          >
-            {`Please fill out your profile. Let potential ${
-              userIsMentee ? 'mentors' : 'mentees'
-            } know a little bit more about you, so you can find the perfect fit. If you have filled out your profile: Great! Make sure you keep it up to date.`}
-          </Content>
-        </Columns.Column>
-      </Columns>
-      <Element
-        className="block-separator"
-        responsive={{ tablet: { hide: { value: true } } }}
-      >
-        <Content size="medium" renderAs="p">
-          {`Please fill out your profile. Let potential ${
-            userIsMentee ? 'mentors' : 'mentees'
-          } know a little bit more about you, so you can find the perfect fit. If you have filled out your profile: Great! Make sure you keep it up to date.`}
-        </Content>
-      </Element>
-      <Element className="block-separator">
-        <EditableAbout />
-      </Element>
-
-      <Element className="block-separator">
-        <EditableMentoringTopics />
-      </Element>
-
-      {userIsMentor && (
-        <Element className="block-separator">
-          <Columns>
-            <Columns.Column size={12}>
-              <EditableMenteeCount />
-            </Columns.Column>
-          </Columns>
-        </Element>
-      )}
-
-      <Element className="block-separator">
-        <Columns>
-          <Columns.Column size={6}>
-            <Element className="block-separator">
-              <EditableContactDetails />
-            </Element>
-          </Columns.Column>
-          <Columns.Column size={6}>
-            <EditableSocialMedia />
-          </Columns.Column>
-        </Columns>
-      </Element>
-
-      <Element className="block-separator">
-        <Columns>
-          <Columns.Column size={6}>
-            <Element className="block-separator">
-              <EditablePersonalDetail />
-            </Element>
-          </Columns.Column>
-          <Columns.Column size={6}>
-            <EditableLanguages />
-          </Columns.Column>
-        </Columns>
-      </Element>
-
-      {userIsMentee && (
-        <Element className="block-separator">
-          <Columns>
-            <Columns.Column size={6}>
-              <Element className="block-separator">
-                <EditableEducation />
-              </Element>
-            </Columns.Column>
-            <Columns.Column size={6}>
-              <EditableRediClass />
-            </Columns.Column>
-          </Columns>
-        </Element>
-      )}
-
-      <Element className="block-separator">
-        <Columns>
-          <Columns.Column size={6}>
-            <EditableOccupation />
-          </Columns.Column>
-        </Columns>
-      </Element>
-    </LoggedIn>
+    <>
+      {userIsMentee ? <MeMenteeProfile /> : null}
+      {userIsMentor ? <MeMentorProfile /> : null}
+    </>
   )
 }
 
diff --git a/apps/redi-connect/src/pages/app/me/MeMentorProfile.tsx b/apps/redi-connect/src/pages/app/me/MeMentorProfile.tsx
new file mode 100644
index 000000000..4ee570284
--- /dev/null
+++ b/apps/redi-connect/src/pages/app/me/MeMentorProfile.tsx
@@ -0,0 +1,134 @@
+import {
+  Heading,
+  Loader,
+} from '@talent-connect/shared-atomic-design-components'
+import React from 'react'
+import { Columns, Content, Element } from 'react-bulma-components'
+import { connect } from 'react-redux'
+import {
+  Avatar,
+  EditableAbout,
+  EditableContactDetails,
+  EditableLanguages,
+  EditableMenteeCount,
+  EditableOccupation,
+  EditablePersonalDetail,
+  EditableSocialMedia,
+} from '../../../components/organisms'
+import EditableMentoringGoals from '../../../components/organisms/EditableMentoringGoals'
+import EditableMentoringTopicsNew2022 from '../../../components/organisms/EditableMentoringTopicsNew2022'
+import EditableProfessionalExperienceFields from '../../../components/organisms/EditableProfessionalExperienceFields'
+import { LoggedIn } from '../../../components/templates'
+import { RootState } from '../../../redux/types'
+import { profileFetchStart } from '../../../redux/user/actions'
+
+const MeMentorProfile = ({ loading, saveResult, profile }: any) => {
+  if (loading) return <Loader loading={true} />
+
+  return (
+    <LoggedIn>
+      {saveResult === 'error' && <>An error occurred, please try again.</>}
+      {saveResult === 'submitting' && <Loader loading={true} />}
+
+      <Columns vCentered breakpoint="mobile" className="oneandhalf-bs">
+        <Columns.Column size={3}>
+          <Avatar.Editable />
+        </Columns.Column>
+        <Columns.Column size={8}>
+          <Heading>Hi, {profile.firstName}</Heading>
+          <Content
+            size="medium"
+            renderAs="p"
+            responsive={{ mobile: { hide: { value: true } } }}
+          >
+            Please fill out your profile. Let potential mentees know a little
+            bit more about you, so you can find the perfect fit. If you have
+            filled out your profile: Great! Make sure you keep it up to date.
+          </Content>
+        </Columns.Column>
+      </Columns>
+      <Element
+        className="block-separator"
+        responsive={{ tablet: { hide: { value: true } } }}
+      >
+        <Content size="medium" renderAs="p">
+          Please fill out your profile. Let potential mentees know a little bit
+          more about you, so you can find the perfect fit. If you have filled
+          out your profile: Great! Make sure you keep it up to date.
+        </Content>
+      </Element>
+      <Element className="block-separator">
+        <EditableAbout />
+      </Element>
+
+      <Element className="block-separator">
+        <Columns>
+          <Columns.Column size={12}>
+            <EditableMenteeCount />
+          </Columns.Column>
+        </Columns>
+      </Element>
+
+      <Element className="block-separator">
+        <Columns>
+          <Columns.Column size={6}>
+            <Element className="block-separator">
+              <EditableContactDetails />
+            </Element>
+          </Columns.Column>
+          <Columns.Column size={6}>
+            <EditableSocialMedia />
+          </Columns.Column>
+        </Columns>
+      </Element>
+
+      <Element className="block-separator">
+        <Columns>
+          <Columns.Column size={6}>
+            <Element className="block-separator">
+              <EditablePersonalDetail />
+            </Element>
+          </Columns.Column>
+          <Columns.Column size={6}>
+            <EditableLanguages />
+          </Columns.Column>
+        </Columns>
+      </Element>
+
+      <Element className="block-separator">
+        <Columns>
+          <Columns.Column size={6}>
+            <EditableOccupation />
+          </Columns.Column>
+        </Columns>
+      </Element>
+
+      <Element className="block-separator">
+        <Columns>
+          <Columns.Column size={6}>
+            <EditableMentoringGoals />
+          </Columns.Column>
+          <Columns.Column size={6}>
+            <EditableProfessionalExperienceFields />
+          </Columns.Column>
+        </Columns>
+      </Element>
+
+      <Element className="block-separator">
+        <EditableMentoringTopicsNew2022 />
+      </Element>
+    </LoggedIn>
+  )
+}
+
+const mapStateToProps = (state: RootState) => ({
+  saveResult: state.user.saveResult,
+  loading: state.user.loading,
+  profile: state.user.profile,
+})
+
+const mapDispatchToProps = (dispatch: any) => ({
+  profileFetchStart: () => dispatch(profileFetchStart()),
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(MeMentorProfile)
diff --git a/apps/redi-connect/src/pages/app/me/me-mentee-profile/EditableMentoringGoalTopics.tsx b/apps/redi-connect/src/pages/app/me/me-mentee-profile/EditableMentoringGoalTopics.tsx
new file mode 100644
index 000000000..1d809f3f3
--- /dev/null
+++ b/apps/redi-connect/src/pages/app/me/me-mentee-profile/EditableMentoringGoalTopics.tsx
@@ -0,0 +1,228 @@
+import {
+  Caption,
+  Editable,
+  FormSelect,
+} from '@talent-connect/shared-atomic-design-components'
+import {
+  DESIRED_ROLES,
+  MENTORING_GOALS,
+  MENTORING_TOPICS,
+} from '@talent-connect/shared-config'
+import { RedProfile } from '@talent-connect/shared-types'
+import { objectEntries } from '@talent-connect/typescript-utilities'
+import { FormikValues, useFormik } from 'formik'
+import React, { useEffect } from 'react'
+import { Columns, Element } from 'react-bulma-components'
+import { connect } from 'react-redux'
+import * as Yup from 'yup'
+import { RootState } from '../../../../redux/types'
+import { profileSaveStart } from '../../../../redux/user/actions'
+import ReadMentoringGoalTopics from './ReadMentoringGoalTopics'
+
+type FormValues = Pick<
+  RedProfile,
+  | 'mentee_mentoringGoal'
+  | 'mentee_overarchingMentoringTopics'
+  | 'mentee_primaryRole_fieldOfExpertise'
+  | 'mentee_primaryRole_mentoringTopics'
+  | 'mentee_secondaryRole_fieldOfExpertise'
+  | 'mentee_secondaryRole_mentoringTopics'
+>
+
+interface Props {
+  profile: RedProfile | undefined
+  profileSaveStart: Function
+}
+
+const validationSchema = Yup.object({
+  mentee_mentoringGoal: Yup.string()
+    .nullable()
+    .required('Please select a mentoring goal'),
+  mentee_primaryRole_fieldOfExpertise: Yup.string()
+    .nullable()
+    .required('Please select a role'),
+  mentee_overarchingMentoringTopics: Yup.array().max(
+    3,
+    'You can select up to three topics'
+  ),
+  mentee_primaryRole_mentoringTopics: Yup.array().max(
+    3,
+    'You can select up to three skills'
+  ),
+  mentee_secondaryRole_mentoringTopics: Yup.array().max(
+    3,
+    'You can select up to three skills'
+  ),
+})
+
+const EditableMentoringGoalTopics = ({ profile, profileSaveStart }: Props) => {
+  const {
+    id,
+    mentee_mentoringGoal,
+    mentee_overarchingMentoringTopics = [],
+    mentee_primaryRole_fieldOfExpertise,
+    mentee_primaryRole_mentoringTopics = [],
+    mentee_secondaryRole_fieldOfExpertise,
+    mentee_secondaryRole_mentoringTopics = [],
+  } = profile as RedProfile
+
+  const submitForm = async (values: FormikValues) => {
+    const profileMentoring = values as Partial<RedProfile>
+    profileSaveStart({ ...profileMentoring, id })
+  }
+
+  const initialValues: FormValues = {
+    mentee_mentoringGoal,
+    mentee_overarchingMentoringTopics,
+    mentee_primaryRole_fieldOfExpertise,
+    mentee_primaryRole_mentoringTopics,
+    mentee_secondaryRole_fieldOfExpertise,
+    mentee_secondaryRole_mentoringTopics,
+  }
+
+  const formik = useFormik({
+    initialValues,
+    enableReinitialize: true,
+    validationSchema,
+    onSubmit: submitForm,
+  })
+
+  useEffect(() => {
+    if (mentee_primaryRole_fieldOfExpertise)
+      formik.setFieldValue('mentee_primaryRole_mentoringTopics', [])
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [formik.values.mentee_primaryRole_fieldOfExpertise])
+
+  useEffect(() => {
+    if (mentee_secondaryRole_fieldOfExpertise)
+      formik.setFieldValue('mentee_secondaryRole_mentoringTopics', [])
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [formik.values.mentee_secondaryRole_fieldOfExpertise])
+
+  return (
+    <>
+      <Caption bold></Caption>
+      <Editable
+        title="Mentoring Goals and Topics"
+        titleBold
+        onSave={() => formik.handleSubmit()}
+        onClose={() => formik.resetForm()}
+        savePossible={formik.dirty && formik.isValid}
+        read={<ReadMentoringGoalTopics.Me caption />}
+        className="mentoring"
+      >
+        <Element className="block-thicker-separator-dashed">
+          <Columns>
+            <Columns.Column size={6}>
+              <Caption>Goal*</Caption>
+              <FormSelect
+                label="The most important goal to address with your mentor"
+                name="mentee_mentoringGoal"
+                placeholder="Select..."
+                items={formMentoringGoals}
+                {...formik}
+              />
+            </Columns.Column>
+            <Columns.Column size={6}>
+              <Caption>Topics</Caption>
+              <FormSelect
+                label="General topics you'd like to be mentored on (max 3)"
+                name="mentee_overarchingMentoringTopics"
+                placeholder="Select..."
+                items={formMentoringTopicsInGroup('overarchingTopics')}
+                multiselect
+                {...formik}
+              />
+            </Columns.Column>
+          </Columns>
+        </Element>
+        <Element className="block-thicker-separator-dashed">
+          <Columns>
+            <Columns.Column size={6}>
+              <Caption>Primary role*</Caption>
+              <FormSelect
+                label="The primary role you'd like to be mentored on"
+                name="mentee_primaryRole_fieldOfExpertise"
+                placeholder="Select..."
+                items={formFieldsOfExpertise}
+                {...formik}
+              />
+            </Columns.Column>
+            <Columns.Column size={6}>
+              <Caption>Skills</Caption>
+              <FormSelect
+                label="Role-related skills you'd like to be mentored on (max 3)"
+                name="mentee_primaryRole_mentoringTopics"
+                placeholder="Select..."
+                disabled={
+                  formik.values.mentee_primaryRole_fieldOfExpertise === 'other'
+                }
+                items={formMentoringTopicsInGroup(
+                  formik.values.mentee_primaryRole_fieldOfExpertise
+                )}
+                multiselect
+                {...formik}
+              />
+            </Columns.Column>
+          </Columns>
+        </Element>
+        <Element className="block-thicker-separator-dashed">
+          <Columns>
+            <Columns.Column size={6}>
+              <Caption>Secondary role</Caption>
+              <FormSelect
+                label="The secondary role you'd like to be mentored on"
+                name="mentee_secondaryRole_fieldOfExpertise"
+                placeholder="Select..."
+                items={formFieldsOfExpertise}
+                {...formik}
+              />
+            </Columns.Column>
+            <Columns.Column size={6}>
+              <Caption>Skills</Caption>
+              <FormSelect
+                label="Role-related skills you'd like to be mentored on (max 3)"
+                name="mentee_secondaryRole_mentoringTopics"
+                placeholder="Select..."
+                disabled={
+                  formik.values.mentee_secondaryRole_fieldOfExpertise ===
+                  'other'
+                }
+                items={formMentoringTopicsInGroup(
+                  formik.values.mentee_secondaryRole_fieldOfExpertise
+                )}
+                multiselect
+                {...formik}
+              />
+            </Columns.Column>
+          </Columns>
+        </Element>
+      </Editable>
+    </>
+  )
+}
+
+const formMentoringGoals = objectEntries(MENTORING_GOALS).map(
+  ([value, label]) => ({ value, label })
+)
+const formFieldsOfExpertise = objectEntries(DESIRED_ROLES).map(
+  ([value, label]) => ({ value, label })
+)
+
+const formMentoringTopicsInGroup = (group) =>
+  MENTORING_TOPICS.filter((topic) => topic.group === group).map(
+    ({ id, label }) => ({ value: id, label })
+  )
+
+const mapStateToProps = (state: RootState) => ({
+  profile: state.user.profile,
+})
+const mapDispatchToProps = (dispatch: any) => ({
+  profileSaveStart: (profile: Partial<RedProfile>) =>
+    dispatch(profileSaveStart(profile)),
+})
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(EditableMentoringGoalTopics)
diff --git a/apps/redi-connect/src/pages/app/me/me-mentee-profile/EditableToolsAndFrameworks.tsx b/apps/redi-connect/src/pages/app/me/me-mentee-profile/EditableToolsAndFrameworks.tsx
new file mode 100644
index 000000000..5821fa8dc
--- /dev/null
+++ b/apps/redi-connect/src/pages/app/me/me-mentee-profile/EditableToolsAndFrameworks.tsx
@@ -0,0 +1,140 @@
+import {
+  Caption,
+  Checkbox,
+  Editable,
+  Placeholder,
+} from '@talent-connect/shared-atomic-design-components'
+import { MENTORING_TOPICS } from '@talent-connect/shared-config'
+import { RedProfile } from '@talent-connect/shared-types'
+import { FormikValues, useFormik } from 'formik'
+import { chunk } from 'lodash'
+import React from 'react'
+import { Columns } from 'react-bulma-components'
+import { connect } from 'react-redux'
+import * as Yup from 'yup'
+import { RootState } from '../../../../redux/types'
+import { profileSaveStart } from '../../../../redux/user/actions'
+import ReadToolsAndFrameworks from './ReadToolsAndFrameworks'
+
+type FormValues = Pick<RedProfile, 'mentee_toolsAndFrameworks_mentoringTopics'>
+
+interface Props {
+  profile: RedProfile | undefined
+  profileSaveStart: Function
+}
+
+const validationSchema = Yup.object({
+  mentee_toolsAndFrameworks_mentoringTopics: Yup.array().max(
+    3,
+    'You can select up to 3 tools and frameworks'
+  ),
+})
+
+const EditableToolsAndFrameworks = ({ profile, profileSaveStart }: Props) => {
+  const { id, mentee_toolsAndFrameworks_mentoringTopics } =
+    profile as RedProfile
+
+  const submitForm = async (values: FormikValues) => {
+    const profileMentoring = values as Partial<RedProfile>
+    profileSaveStart({ ...profileMentoring, id })
+  }
+
+  const initialValues: FormValues = {
+    mentee_toolsAndFrameworks_mentoringTopics:
+      mentee_toolsAndFrameworks_mentoringTopics ?? [],
+  }
+
+  const formik = useFormik({
+    initialValues,
+    enableReinitialize: true,
+    validationSchema,
+    onSubmit: submitForm,
+  })
+
+  const selectedValues = formik.values.mentee_toolsAndFrameworks_mentoringTopics
+
+  const onChange = (e: any) => {
+    e.persist()
+    const value = e.target.value
+    let newCategories
+    if (e.target.checked) {
+      newCategories = selectedValues.concat(value)
+    } else {
+      newCategories = selectedValues.filter((cat: any) => cat !== value)
+    }
+    formik.setFieldValue(
+      'mentee_toolsAndFrameworks_mentoringTopics',
+      newCategories
+    )
+    formik.setFieldTouched(
+      'mentee_toolsAndFrameworks_mentoringTopics',
+      true,
+      false
+    )
+  }
+
+  return (
+    <>
+      <Caption bold></Caption>
+      <Editable
+        title="Tools and frameworks"
+        titleBold
+        onSave={() => formik.handleSubmit()}
+        onClose={() => formik.resetForm()}
+        savePossible={formik.dirty && formik.isValid}
+        read={<ReadToolsAndFrameworks.Me caption />}
+        className="mentoring"
+      >
+        <Placeholder>
+          Please select tools and technologies you are particularly interested in
+          (max 3).
+        </Placeholder>
+        <Columns>
+          {formToolsAndFrameworksGroups.map((group) => (
+            <Columns.Column size={4}>
+              {group.map((item) => (
+                <Checkbox.Form
+                  name={`${item.value}`}
+                  key={item.value}
+                  value={item.value}
+                  checked={selectedValues.includes(item.value)}
+                  customOnChange={onChange}
+                  disabled={
+                    selectedValues.length >= 3 &&
+                    !selectedValues.includes(item.value)
+                  }
+                  {...formik}
+                >
+                  {item.label}
+                </Checkbox.Form>
+              ))}
+            </Columns.Column>
+          ))}
+        </Columns>
+      </Editable>
+    </>
+  )
+}
+
+const formToolsAndFrameworks = MENTORING_TOPICS.filter(
+  (topic) => topic.group === 'toolsAndFrameworks'
+)
+  .map(({ id, label }) => ({ value: id, label }))
+  .sort((a, b) => (a.label > b.label ? 1 : -1))
+const formToolsAndFrameworksGroups = chunk(
+  formToolsAndFrameworks,
+  Math.ceil(formToolsAndFrameworks.length / 3)
+)
+
+const mapStateToProps = (state: RootState) => ({
+  profile: state.user.profile,
+})
+const mapDispatchToProps = (dispatch: any) => ({
+  profileSaveStart: (profile: Partial<RedProfile>) =>
+    dispatch(profileSaveStart(profile)),
+})
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(EditableToolsAndFrameworks)
diff --git a/apps/redi-connect/src/pages/app/me/me-mentee-profile/MeMenteeProfile.tsx b/apps/redi-connect/src/pages/app/me/me-mentee-profile/MeMenteeProfile.tsx
new file mode 100644
index 000000000..5ff182a16
--- /dev/null
+++ b/apps/redi-connect/src/pages/app/me/me-mentee-profile/MeMenteeProfile.tsx
@@ -0,0 +1,134 @@
+import {
+  Caption,
+  Heading,
+  Loader,
+} from '@talent-connect/shared-atomic-design-components'
+import React from 'react'
+import { Columns, Content, Element } from 'react-bulma-components'
+import { connect } from 'react-redux'
+import {
+  Avatar,
+  EditableAbout,
+  EditableContactDetails,
+  EditableEducation,
+  EditableLanguages,
+  EditableOccupation,
+  EditablePersonalDetail,
+  EditableRediClass,
+  EditableSocialMedia,
+} from '../../../../components/organisms'
+import { LoggedIn } from '../../../../components/templates'
+import { RootState } from '../../../../redux/types'
+import { profileFetchStart } from '../../../../redux/user/actions'
+import EditableMentoringGoalTopics from './EditableMentoringGoalTopics'
+import EditableToolsAndFrameworks from './EditableToolsAndFrameworks'
+
+const MeMenteeProfile = ({ loading, saveResult, profile }: any) => {
+  if (loading) return <Loader loading={true} />
+
+  return (
+    <LoggedIn>
+      {saveResult === 'error' && <>An error occurred, please try again.</>}
+      {saveResult === 'submitting' && <Loader loading={true} />}
+
+      <Columns vCentered breakpoint="mobile" className="oneandhalf-bs">
+        <Columns.Column size={3}>
+          <Avatar.Editable />
+        </Columns.Column>
+        <Columns.Column size={8}>
+          <Heading>Hi, {profile.firstName}</Heading>
+          <Content
+            size="medium"
+            renderAs="p"
+            responsive={{ mobile: { hide: { value: true } } }}
+          >
+            Please fill out your profile. Let potential mentors know a little
+            bit more about you, so you can find the perfect fit. If you have
+            filled out your profile: Great! Make sure you keep it up to date.
+          </Content>
+        </Columns.Column>
+      </Columns>
+      <Element
+        className="block-thicker-separator"
+        responsive={{ tablet: { hide: { value: true } } }}
+      >
+        <Content size="medium" renderAs="p">
+          Please fill out your profile. Let potential mentors know a little bit
+          more about you, so you can find the perfect fit. If you have filled
+          out your profile: Great! Make sure you keep it up to date.
+        </Content>
+      </Element>
+      <Element className="block-thicker-separator">
+        <EditableAbout />
+      </Element>
+
+      <Element className="block-thicker-separator-dashed">
+        <Caption bold>Professional experience and contact details</Caption>
+        <Columns>
+          <Columns.Column size={6}>
+            <Element className="block-thicker-separator">
+              <EditableContactDetails />
+            </Element>
+          </Columns.Column>
+          <Columns.Column size={6}>
+            <EditableSocialMedia />
+          </Columns.Column>
+        </Columns>
+      </Element>
+
+      <Element className="block-thicker-separator-dashed">
+        <Columns>
+          <Columns.Column size={6}>
+            <Element className="block-thicker-separator">
+              <EditablePersonalDetail />
+            </Element>
+          </Columns.Column>
+          <Columns.Column size={6}>
+            <EditableLanguages />
+          </Columns.Column>
+        </Columns>
+      </Element>
+
+      <Element className="block-thicker-separator-dashed">
+        <Columns>
+          <Columns.Column size={6}>
+            <Element className="block-thicker-separator">
+              <EditableEducation />
+            </Element>
+          </Columns.Column>
+          <Columns.Column size={6}>
+            <EditableRediClass />
+          </Columns.Column>
+        </Columns>
+      </Element>
+
+      <Element className="block-thicker-separator">
+        <Columns>
+          <Columns.Column size={6}>
+            <EditableOccupation />
+          </Columns.Column>
+        </Columns>
+      </Element>
+
+      <Element className="block-thicker-separator">
+        <EditableMentoringGoalTopics />
+      </Element>
+
+      <Element className="block-thicker-separator">
+        <EditableToolsAndFrameworks />
+      </Element>
+    </LoggedIn>
+  )
+}
+
+const mapStateToProps = (state: RootState) => ({
+  saveResult: state.user.saveResult,
+  loading: state.user.loading,
+  profile: state.user.profile,
+})
+
+const mapDispatchToProps = (dispatch: any) => ({
+  profileFetchStart: () => dispatch(profileFetchStart()),
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(MeMenteeProfile)
diff --git a/apps/redi-connect/src/pages/app/me/me-mentee-profile/ReadMentoringGoalTopics.tsx b/apps/redi-connect/src/pages/app/me/me-mentee-profile/ReadMentoringGoalTopics.tsx
new file mode 100644
index 000000000..7dcf906c2
--- /dev/null
+++ b/apps/redi-connect/src/pages/app/me/me-mentee-profile/ReadMentoringGoalTopics.tsx
@@ -0,0 +1,137 @@
+import {
+  Caption,
+  CardTags,
+  Placeholder,
+} from '@talent-connect/shared-atomic-design-components'
+import {
+  FIELDS_OF_EXPERTISE,
+  MENTORING_GOALS,
+  MENTORING_TOPICS_MAP,
+} from '@talent-connect/shared-config'
+import { RedProfile } from '@talent-connect/shared-types'
+import React from 'react'
+import { Columns, Element } from 'react-bulma-components'
+import { connect } from 'react-redux'
+import { RootState } from '../../../../redux/types'
+
+interface ReadMentoringProps {
+  profile: RedProfile
+  caption?: boolean
+}
+
+const ReadMentoringGoalTopics = ({ profile, caption }: ReadMentoringProps) => {
+  const {
+    mentee_mentoringGoal,
+    mentee_overarchingMentoringTopics = [],
+    mentee_primaryRole_fieldOfExpertise,
+    mentee_primaryRole_mentoringTopics = [],
+    mentee_secondaryRole_fieldOfExpertise,
+    mentee_secondaryRole_mentoringTopics = [],
+  } = profile
+
+  return (
+    <>
+      <Element className="block-thicker-separator-dashed">
+        <Columns>
+          <Columns.Column size={6}>
+            <Caption>Goal</Caption>
+            {mentee_mentoringGoal ? (
+              <CardTags items={[MENTORING_GOALS[mentee_mentoringGoal]]} />
+            ) : (
+              <Placeholder>
+                The most important goal to address with your
+                mentor.
+              </Placeholder>
+            )}
+          </Columns.Column>
+          <Columns.Column size={6}>
+            <Caption>Topics</Caption>
+            {mentee_overarchingMentoringTopics.length > 0 ? (
+              <CardTags
+                items={mentee_overarchingMentoringTopics}
+                formatter={(item) => MENTORING_TOPICS_MAP[item]}
+              />
+            ) : (
+              <Placeholder>
+                General topics you would like to be mentored on.
+              </Placeholder>
+            )}
+          </Columns.Column>
+        </Columns>
+      </Element>
+      <Element className="block-thicker-separator-dashed">
+        <Columns>
+          <Columns.Column size={6}>
+            <Caption>Primary role</Caption>
+            {mentee_primaryRole_fieldOfExpertise ? (
+              <CardTags
+                items={[
+                  FIELDS_OF_EXPERTISE[mentee_primaryRole_fieldOfExpertise],
+                ]}
+              />
+            ) : (
+              <Placeholder>
+                The primary role you would like to be mentored on.
+              </Placeholder>
+            )}
+          </Columns.Column>
+          <Columns.Column size={6}>
+            <Caption>Skills</Caption>
+            {mentee_primaryRole_mentoringTopics.length > 0 ? (
+              <CardTags
+                items={mentee_primaryRole_mentoringTopics}
+                formatter={(item) => MENTORING_TOPICS_MAP[item]}
+              />
+            ) : (
+              <Placeholder>
+                Role-related skills you would like to be mentored on.
+              </Placeholder>
+            )}
+          </Columns.Column>
+        </Columns>
+      </Element>
+      <Element className="block-thicker-separator-dashed">
+        <Columns>
+          <Columns.Column size={6}>
+            <Caption>Secondary role</Caption>
+            {mentee_secondaryRole_fieldOfExpertise ? (
+              <CardTags
+                items={[
+                  FIELDS_OF_EXPERTISE[mentee_secondaryRole_fieldOfExpertise],
+                ]}
+              />
+            ) : (
+              <Placeholder>
+                The secondary role you would like to be mentored on.
+              </Placeholder>
+            )}
+          </Columns.Column>
+          <Columns.Column size={6}>
+            <Caption>Skills</Caption>
+            {mentee_secondaryRole_mentoringTopics.length > 0 ? (
+              <CardTags
+                items={mentee_secondaryRole_mentoringTopics}
+                formatter={(item) => MENTORING_TOPICS_MAP[item]}
+              />
+            ) : (
+              <Placeholder>
+                Role-related skills you would like to be mentored on.
+              </Placeholder>
+            )}
+          </Columns.Column>
+        </Columns>
+      </Element>
+    </>
+  )
+}
+
+const mapStateToProps = (state: RootState) => ({
+  profile: state.user.profile as RedProfile,
+})
+
+export default {
+  Me: connect(mapStateToProps, {})(ReadMentoringGoalTopics),
+  Some: ({ profile }: ReadMentoringProps) => (
+    <ReadMentoringGoalTopics profile={profile} />
+  ),
+}
diff --git a/apps/redi-connect/src/pages/app/me/me-mentee-profile/ReadToolsAndFrameworks.tsx b/apps/redi-connect/src/pages/app/me/me-mentee-profile/ReadToolsAndFrameworks.tsx
new file mode 100644
index 000000000..98928f2cc
--- /dev/null
+++ b/apps/redi-connect/src/pages/app/me/me-mentee-profile/ReadToolsAndFrameworks.tsx
@@ -0,0 +1,46 @@
+import {
+  CardTags,
+  Placeholder,
+} from '@talent-connect/shared-atomic-design-components'
+import { MENTORING_TOPICS_MAP } from '@talent-connect/shared-config'
+import { RedProfile } from '@talent-connect/shared-types'
+import React from 'react'
+import { Element } from 'react-bulma-components'
+import { connect } from 'react-redux'
+import { RootState } from '../../../../redux/types'
+
+interface ReadMentoringProps {
+  profile: RedProfile
+  caption?: boolean
+}
+
+const ReadToolsAndFrameworks = ({ profile, caption }: ReadMentoringProps) => {
+  const { mentee_toolsAndFrameworks_mentoringTopics = [] } = profile
+
+  return (
+    <Element className="block-separator">
+      {mentee_toolsAndFrameworks_mentoringTopics.length > 0 ? (
+        <CardTags
+          items={mentee_toolsAndFrameworks_mentoringTopics}
+          formatter={(item) => MENTORING_TOPICS_MAP[item]}
+        />
+      ) : (
+        <Placeholder>
+          Please select tools and technologies you are particularly interested in
+          (max 3).
+        </Placeholder>
+      )}
+    </Element>
+  )
+}
+
+const mapStateToProps = (state: RootState) => ({
+  profile: state.user.profile as RedProfile,
+})
+
+export default {
+  Me: connect(mapStateToProps, {})(ReadToolsAndFrameworks),
+  Some: ({ profile }: ReadMentoringProps) => (
+    <ReadToolsAndFrameworks profile={profile} />
+  ),
+}
diff --git a/apps/redi-connect/src/redux/matches/epics.ts b/apps/redi-connect/src/redux/matches/epics.ts
index 3dee161dc..5c2334ddc 100644
--- a/apps/redi-connect/src/redux/matches/epics.ts
+++ b/apps/redi-connect/src/redux/matches/epics.ts
@@ -96,7 +96,6 @@ export const matchesAcceptMentorshipEpic = (action$: ActionsObservable<any>) =>
 
 export const matchesDeclineMentorshipEpic = (action$: ActionsObservable<any>) =>
   action$.pipe(
-    tap((p) => console.log('Hello hello', p)),
     ofType(MatchesActionType.MATCHES_DECLINE_MENTORSHIP_START),
     switchMap((action) => {
       const request = from(
diff --git a/apps/redi-connect/src/services/api/api.tsx b/apps/redi-connect/src/services/api/api.tsx
index 48853f9e1..93ddc6894 100644
--- a/apps/redi-connect/src/services/api/api.tsx
+++ b/apps/redi-connect/src/services/api/api.tsx
@@ -129,25 +129,11 @@ export interface RedProfileFilters {
 
 export const getProfiles = ({
   userType,
-  categories,
-  languages,
-  locations,
   nameQuery,
 }: RedProfileFilters): Promise<RedProfile[]> => {
-  const filterLanguages =
-    languages && languages.length !== 0 ? { inq: languages } : undefined
-  const filterCategories =
-    categories && categories.length !== 0 ? { inq: categories } : undefined
-  const filterLocations =
-    locations && locations.length !== 0 ? { inq: locations } : undefined
-
   return http(
     `${API_URL}/redProfiles?filter=${JSON.stringify({
       where: {
-        // loopbackComputedDoNotSetElsewhere__forAdminSearch__fullName: {
-        //   like: 'Carlotta3',
-        //   options: 'i',
-        // },
         and: [
           ...String(nameQuery)
             .split(' ')
@@ -158,9 +144,6 @@ export const getProfiles = ({
               },
             })),
           { userType },
-          { languages: filterLanguages },
-          { categories: filterCategories },
-          { rediLocation: filterLocations },
           { userActivated: true },
         ],
       },
@@ -170,17 +153,9 @@ export const getProfiles = ({
   ).then((resp) => resp.data)
 }
 
-export const getMentors = ({
-  categories,
-  languages,
-  locations,
-  nameQuery,
-}: Partial<RedProfileFilters>) =>
+export const getMentors = ({ nameQuery }: Partial<RedProfileFilters>) =>
   getProfiles({
     userType: 'mentor',
-    categories,
-    languages,
-    locations,
     nameQuery,
   })
 
diff --git a/apps/redi-connect/src/styles/_global.scss b/apps/redi-connect/src/styles/_global.scss
index 8e1cdbc18..9cc13d8e1 100644
--- a/apps/redi-connect/src/styles/_global.scss
+++ b/apps/redi-connect/src/styles/_global.scss
@@ -16,3 +16,35 @@
     border-bottom: 1px solid $grey-light;
   }
 }
+
+.block-thicker-separator {
+  .block-thicker-separator {
+    @include mobile() {
+      padding-bottom: 1.5rem;
+      margin-bottom: -0.5rem;
+      border-bottom: 2px solid $grey-light;
+    }
+  }
+
+  &:not(:last-child) {
+    padding-bottom: 1.5rem;
+    margin-bottom: 1.5rem;
+    border-bottom: 2px solid $grey-light;
+  }
+}
+
+.block-thicker-separator-dashed {
+  .block-thicker-separator-dashed {
+    @include mobile() {
+      padding-bottom: 1.5rem;
+      margin-bottom: -0.5rem;
+      border-bottom: 2px dashed $grey-light;
+    }
+  }
+
+  &:not(:last-child) {
+    padding-bottom: 1.5rem;
+    margin-bottom: 1.5rem;
+    border-bottom: 2px dashed $grey-light;
+  }
+}
diff --git a/libs/shared-atomic-design-components/src/lib/atoms/Caption.tsx b/libs/shared-atomic-design-components/src/lib/atoms/Caption.tsx
index 22ad04df8..8407d593e 100644
--- a/libs/shared-atomic-design-components/src/lib/atoms/Caption.tsx
+++ b/libs/shared-atomic-design-components/src/lib/atoms/Caption.tsx
@@ -2,10 +2,13 @@ import React from 'react'
 import { Heading as BulmaHeading } from 'react-bulma-components'
 import './Caption.scss'
 
-const Caption: React.FunctionComponent = ({ children }) => (
+const Caption: React.FunctionComponent<{ bold?: boolean }> = ({
+  bold = false,
+  children,
+}) => (
   <BulmaHeading
     size={5}
-    weight="normal"
+    weight={bold ? 'bold' : 'normal'}
     renderAs="h3"
     className="caption"
     subtitle
diff --git a/libs/shared-atomic-design-components/src/lib/molecules/Editable.tsx b/libs/shared-atomic-design-components/src/lib/molecules/Editable.tsx
index b9cc8e30f..6549fc7be 100644
--- a/libs/shared-atomic-design-components/src/lib/molecules/Editable.tsx
+++ b/libs/shared-atomic-design-components/src/lib/molecules/Editable.tsx
@@ -5,6 +5,7 @@ import './Editable.scss'
 
 interface Props {
   title: string
+  titleBold?: boolean
   onSave: () => void
   onClose: () => void
   read: React.ReactNode
@@ -17,6 +18,7 @@ interface Props {
 function Editable(props: Props) {
   const {
     title,
+    titleBold,
     children,
     read,
     onSave,
@@ -40,7 +42,7 @@ function Editable(props: Props) {
   return (
     <div className={classnames('editable', { [`${className}`]: className })}>
       <div className="editable__header">
-        <Caption>{title}</Caption>
+        <Caption bold={Boolean(titleBold)}>{title}</Caption>
         <div className="editable__header__buttons">
           {isEditing ? (
             <>
diff --git a/libs/shared-atomic-design-components/src/lib/styles/_global.scss b/libs/shared-atomic-design-components/src/lib/styles/_global.scss
index 8e1cdbc18..9cc13d8e1 100644
--- a/libs/shared-atomic-design-components/src/lib/styles/_global.scss
+++ b/libs/shared-atomic-design-components/src/lib/styles/_global.scss
@@ -16,3 +16,35 @@
     border-bottom: 1px solid $grey-light;
   }
 }
+
+.block-thicker-separator {
+  .block-thicker-separator {
+    @include mobile() {
+      padding-bottom: 1.5rem;
+      margin-bottom: -0.5rem;
+      border-bottom: 2px solid $grey-light;
+    }
+  }
+
+  &:not(:last-child) {
+    padding-bottom: 1.5rem;
+    margin-bottom: 1.5rem;
+    border-bottom: 2px solid $grey-light;
+  }
+}
+
+.block-thicker-separator-dashed {
+  .block-thicker-separator-dashed {
+    @include mobile() {
+      padding-bottom: 1.5rem;
+      margin-bottom: -0.5rem;
+      border-bottom: 2px dashed $grey-light;
+    }
+  }
+
+  &:not(:last-child) {
+    padding-bottom: 1.5rem;
+    margin-bottom: 1.5rem;
+    border-bottom: 2px dashed $grey-light;
+  }
+}
diff --git a/libs/shared-config/src/index.ts b/libs/shared-config/src/index.ts
index 92aae0c0a..814336830 100644
--- a/libs/shared-config/src/index.ts
+++ b/libs/shared-config/src/index.ts
@@ -1 +1,2 @@
 export * from './lib/config'
+export * from './lib/mentoring-data-lists'
diff --git a/libs/shared-config/src/lib/config.ts b/libs/shared-config/src/lib/config.ts
index 8573729ce..f4e76d0d2 100644
--- a/libs/shared-config/src/lib/config.ts
+++ b/libs/shared-config/src/lib/config.ts
@@ -5,152 +5,6 @@ export const REDI_LOCATION_NAMES = {
   nrw: 'NRW',
 } as const
 
-export const CATEGORY_GROUPS = {
-  softwareEngineering: '👩‍💻 Software Engineering',
-  design: '🎨 Design',
-  otherProfessions: '🏄‍♀️ Other Professions',
-  careerSupport: '✋ Career Support',
-  language: '🗣️ Language Support',
-  other: '🤗 Other',
-} as const
-
-export const CATEGORIES = [
-  {
-    id: 'basicProgrammingSkills',
-    label: 'Basic programming skills',
-    group: 'softwareEngineering',
-  },
-  { id: 'htmlCss', label: 'HTML & CSS', group: 'softwareEngineering' },
-  { id: 'javascript', label: 'Javascript', group: 'softwareEngineering' },
-  { id: 'react', label: 'React', group: 'softwareEngineering' },
-  { id: 'java', label: 'Java', group: 'softwareEngineering' },
-  { id: 'python', label: 'Python', group: 'softwareEngineering' },
-  {
-    id: 'dataAnalytics',
-    label: 'Data Analytics',
-    group: 'softwareEngineering',
-  },
-  {
-    id: 'machineLearning',
-    label: 'Machine Learning',
-    group: 'softwareEngineering',
-  },
-  {
-    id: 'mobileDevelopmentIos',
-    label: 'iOS Mobile Development',
-    group: 'softwareEngineering',
-  },
-  {
-    id: 'mobileDevelopmentAndroid',
-    label: 'Android Mobile Development',
-    group: 'softwareEngineering',
-  },
-  { id: 'salesforce', label: 'Salesforce', group: 'softwareEngineering' },
-  {
-    id: 'devOpsCloud',
-    label: 'DevOps and Cloud (e.g. Azure, AWS)',
-    group: 'softwareEngineering',
-  },
-  { id: 'iot', label: 'IoT', group: 'softwareEngineering' },
-  {
-    id: 'computerNetworking',
-    label: 'Computer Networking',
-    group: 'softwareEngineering',
-  },
-  { id: 'blockchain', label: 'Blockchain', group: 'softwareEngineering' },
-  {
-    id: 'productManagement',
-    label: 'Product Management',
-    group: 'otherProfessions',
-  },
-  {
-    id: 'projectManagement',
-    label: 'Project Management',
-    group: 'otherProfessions',
-  },
-  {
-    id: 'digitalMarketing',
-    label: 'Digital Marketing',
-    group: 'otherProfessions',
-  },
-  {
-    id: 'businessDevelopment',
-    label: 'Business Development',
-    group: 'otherProfessions',
-  },
-  { id: 'sales', label: 'Sales', group: 'otherProfessions' },
-  {
-    id: 'qualityAssurance',
-    label: 'Quality Assurance',
-    group: 'otherProfessions',
-  },
-  { id: 'basicGerman', label: 'Basic German 🇩🇪', group: 'language' },
-  { id: 'businessGerman', label: 'Business German 🇩🇪', group: 'language' },
-  { id: 'english', label: 'English 🇬🇧', group: 'language' },
-  { id: 'graphicDesign', label: 'Graphic Design', group: 'design' },
-  {
-    id: 'userInterfaceDesign',
-    label: 'User Interface Design',
-    group: 'design',
-  },
-  {
-    id: 'userExperienceDesign',
-    label: 'User Experience Design',
-    group: 'design',
-  },
-  {
-    id: 'motivationAndEncouragement',
-    label: 'Motivation & encouragement',
-    group: 'other',
-  },
-  { id: 'friendAndHelp', label: 'Be a friend and help', group: 'other' },
-  { id: 'dontKnowYet', label: "I don't know yet", group: 'other' },
-  {
-    id: 'careerOrientationAndPlanning',
-    label: 'Career orientation & planning',
-    group: 'careerSupport',
-  },
-  {
-    id: 'internshipOrWorkingStudent',
-    label: 'Internship / working student position search',
-    group: 'careerSupport',
-  },
-  { id: 'jobSearch', label: 'Job search', group: 'careerSupport' },
-  {
-    id: 'jobApplicationsCvPreparationEnglish',
-    label: 'Job applications and CV preparation in English',
-    group: 'careerSupport',
-  },
-  {
-    id: 'jobApplicationsCvPreparationGerman',
-    label: 'Job applications and CV preparation in German',
-    group: 'careerSupport',
-  },
-  {
-    id: 'interviewPreparation',
-    label: 'Interview preparation',
-    group: 'careerSupport',
-  },
-  {
-    id: 'codingChallengePreparation',
-    label: 'Coding challenge preparation',
-    group: 'careerSupport',
-  },
-  {
-    id: 'buildingProfessionalNetwork',
-    label: 'Building a professional network',
-    group: 'careerSupport',
-  },
-  { id: 'entrepreneurship', label: 'Entrepreneurship', group: 'careerSupport' },
-  { id: 'freelancing', label: 'Freelancing', group: 'careerSupport' },
-] as const
-export type CategoryKey = typeof CATEGORIES[number]['id']
-export type CategoryLabel = typeof CATEGORIES[number]['label']
-
-export const CATEGORIES_MAP = Object.fromEntries(
-  CATEGORIES.map((cat) => [cat.id, cat.label])
-) as Record<CategoryKey, CategoryLabel>
-
 export const LANGUAGES = [
   'Afrikaans',
   'Albanian',
diff --git a/libs/shared-config/src/lib/mentoring-data-lists.ts b/libs/shared-config/src/lib/mentoring-data-lists.ts
new file mode 100644
index 000000000..0db11ddbb
--- /dev/null
+++ b/libs/shared-config/src/lib/mentoring-data-lists.ts
@@ -0,0 +1,578 @@
+export const MENTORING_GOALS = {
+  buildingAProfessionalNetwork: 'Building a professional network',
+  jobSearchAndApplicationProcess: 'Job search and application process',
+  entrepreneurshipAndFreelancing: 'Entrepreneurship and freelancing',
+  tutoringInAParticularSkillTool: 'Tutoring in a particular skill / tool',
+  careerOrientatioPlanning: 'Career orientation & planning',
+  preparationForACertificationInterview:
+    'Preparation for a certification / interview',
+} as const
+
+export type MentoringGoalKey = keyof typeof MENTORING_GOALS
+
+export const DESIRED_ROLES = {
+  marketingSocialMediaAndSales: 'Marketing, social media and sales',
+  productAndProjectManagement: 'Product and project management',
+  requirementsAnalysisAndResearch: 'Requirements analysis and research',
+  softwareDevelopment: 'Software development',
+  uxAndUiDesign: 'UX and UI design',
+  testingAndQualityAssurance: 'Testing and Quality Assurance',
+  other: 'Other',
+} as const
+
+export type DesiredRolesKey = keyof typeof FIELDS_OF_EXPERTISE
+
+export const FIELDS_OF_EXPERTISE = {
+  humanResourcesAndRecruiting: 'Human resources and recruiting',
+  ...DESIRED_ROLES,
+} as const
+
+export type FieldOfExperienceKey = keyof typeof FIELDS_OF_EXPERTISE
+
+export const MENTORING_TOPIC_GROUPS = {
+  overarchingTopics: '🌈 Overarching topics',
+  marketingSocialMediaAndSales: '🚦 Marketing, social media and sales',
+  requirementsAnalysisAndResearch: '🧪 Requirements analysis and research',
+  uxAndUiDesign: '🎨 UX and UI design',
+  testingAndQualityAssurance: '🏎️ Testing and Quality Assurance',
+  productAndProjectManagement: '📋 Product and project management',
+  softwareDevelopment: '👩‍💻 Software development',
+  toolsAndFrameworks: '🛠️ Tools and frameworks',
+} as const
+
+/*
+overarchingTopics
+productAndProjectManagement
+softwareDevelopment
+*/
+
+export const MENTORING_TOPICS = [
+  {
+    id: 'Application process and portfolio',
+    label: 'Application process and portfolio',
+    group: 'overarchingTopics',
+  },
+  { id: 'Communication', label: 'Communication', group: 'overarchingTopics' },
+  {
+    id: 'Cross-cultural teams',
+    label: 'Cross-cultural teams',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Cross-functional work',
+    label: 'Cross-functional work',
+    group: 'overarchingTopics',
+  },
+  { id: 'Facilitation', label: 'Facilitation', group: 'overarchingTopics' },
+  {
+    id: 'Giving / receiving feedback',
+    label: 'Giving / receiving feedback',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Self-organisation',
+    label: 'Self-organisation',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Social network profile tuning',
+    label: 'Social network profile tuning',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Storytelling and presentation',
+    label: 'Storytelling and presentation',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Team leadership',
+    label: 'Team leadership',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Time management',
+    label: 'Time management',
+    group: 'overarchingTopics',
+  },
+  {
+    id: 'Marketing and social media',
+    label: 'Marketing and social media',
+    group: 'marketingSocialMediaAndSales',
+  },
+  { id: 'Sales', label: 'Sales', group: 'marketingSocialMediaAndSales' },
+  {
+    id: 'Data analysis',
+    label: 'Data analysis',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Design research',
+    label: 'Design research',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Design Thinking',
+    label: 'Design Thinking',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Domain driven design',
+    label: 'Domain driven design',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Mapping customer experience',
+    label: 'Mapping customer experience',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Prioritisation metrics',
+    label: 'Prioritisation metrics',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Process modelling',
+    label: 'Process modelling',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Software Development Life Cycle',
+    label: 'Software Development Life Cycle',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Technical writing',
+    label: 'Technical writing',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'User story mapping',
+    label: 'User story mapping',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Qualitative User Research',
+    label: 'Qualitative User Research',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  {
+    id: 'Quantitative User Research',
+    label: 'Quantitative User Research',
+    group: 'requirementsAnalysisAndResearch',
+  },
+  { id: 'Animation', label: 'Animation', group: 'uxAndUiDesign' },
+  { id: 'Branding', label: 'Branding', group: 'uxAndUiDesign' },
+  {
+    id: 'General user experience',
+    label: 'General user experience',
+    group: 'uxAndUiDesign',
+  },
+  { id: 'Graphic Design', label: 'Graphic Design', group: 'uxAndUiDesign' },
+  {
+    id: 'Information architecture',
+    label: 'Information architecture',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Interaction design',
+    label: 'Interaction design',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Prototyping and wireframing',
+    label: 'Prototyping and wireframing',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Responsive design',
+    label: 'Responsive design',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Typography / color theory',
+    label: 'Typography / color theory',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Visual communication',
+    label: 'Visual communication',
+    group: 'uxAndUiDesign',
+  },
+  {
+    id: 'Automated software testing',
+    label: 'Automated software testing',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Behavior-driven development',
+    label: 'Behavior-driven development',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Cross-browser testing',
+    label: 'Cross-browser testing',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Functional Testing',
+    label: 'Functional Testing',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Software testing methodologies',
+    label: 'Software testing methodologies',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Test-driven development',
+    label: 'Test-driven development',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Test planning',
+    label: 'Test planning',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Test management',
+    label: 'Test management',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Usability testing',
+    label: 'Usability testing',
+    group: 'testingAndQualityAssurance',
+  },
+  {
+    id: 'Agile frameworks',
+    label: 'Agile frameworks',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Budget calculation',
+    label: 'Budget calculation',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Business development',
+    label: 'Business development',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Change management',
+    label: 'Change management',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Enterprise architecture management',
+    label: 'Enterprise architecture management',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Market research',
+    label: 'Market research',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Planning and roadmaps',
+    label: 'Planning and roadmaps',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Prioritisation metrics',
+    label: 'Prioritisation metrics',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Product Backlog management',
+    label: 'Product Backlog management',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Product management',
+    label: 'Product management',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Project management',
+    label: 'Project management',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Project management office',
+    label: 'Project management office',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Value-driven product development',
+    label: 'Value-driven product development',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Value metrics',
+    label: 'Value metrics',
+    group: 'productAndProjectManagement',
+  },
+  {
+    id: 'Front-end development',
+    label: 'Front-end Development',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Back-end development',
+    label: 'Back-end Development',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Android Mobile Development',
+    label: 'Android Mobile Development',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Basic programming skills',
+    label: 'Basic programming skills',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Computer networking',
+    label: 'Computer networking',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Cross-browser development',
+    label: 'Cross-browser development',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Data analytics',
+    label: 'Data analytics',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Database management',
+    label: 'Database management',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'DevOps and Cloud',
+    label: 'DevOps and Cloud',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Hybrid App Development',
+    label: 'Hybrid App Development',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Hardware and networks',
+    label: 'Hardware and networks',
+    group: 'softwareDevelopment',
+  },
+  { id: 'IoT', label: 'IoT', group: 'softwareDevelopment' },
+  {
+    id: 'iOS Mobile Development',
+    label: 'iOS Mobile Development',
+    group: 'softwareDevelopment',
+  },
+  {
+    id: 'Machine learning',
+    label: 'Machine learning',
+    group: 'softwareDevelopment',
+  },
+  { id: 'Security', label: 'Security', group: 'softwareDevelopment' },
+  {
+    id: 'Atlassian Jira',
+    label: 'Atlassian Jira',
+    group: 'toolsAndFrameworks',
+  },
+  { id: 'AWS', label: 'AWS', group: 'toolsAndFrameworks' },
+  { id: 'Azure', label: 'Azure', group: 'toolsAndFrameworks' },
+  {
+    id: 'Balsamiq Mockup',
+    label: 'Balsamiq Mockup',
+    group: 'toolsAndFrameworks',
+  },
+  { id: 'Blockchain', label: 'Blockchain', group: 'toolsAndFrameworks' },
+  { id: 'Cucumber', label: 'Cucumber', group: 'toolsAndFrameworks' },
+  { id: 'Cypress', label: 'Cypress', group: 'toolsAndFrameworks' },
+  { id: 'Docker', label: 'Docker', group: 'toolsAndFrameworks' },
+  { id: 'Figma', label: 'Figma', group: 'toolsAndFrameworks' },
+  { id: 'Flutter', label: 'Flutter', group: 'toolsAndFrameworks' },
+  { id: 'GCP', label: 'GCP', group: 'toolsAndFrameworks' },
+  { id: 'Git', label: 'Git', group: 'toolsAndFrameworks' },
+  { id: 'Gherkin', label: 'Gherkin', group: 'toolsAndFrameworks' },
+  { id: 'HTML & CSS', label: 'HTML & CSS', group: 'toolsAndFrameworks' },
+  { id: 'Java', label: 'Java', group: 'toolsAndFrameworks' },
+  { id: 'JavaScript', label: 'JavaScript', group: 'toolsAndFrameworks' },
+  { id: 'Jest', label: 'Jest', group: 'toolsAndFrameworks' },
+  { id: 'MongoDB', label: 'MongoDB', group: 'toolsAndFrameworks' },
+  { id: 'MySQL', label: 'MySQL', group: 'toolsAndFrameworks' },
+  { id: 'NodeJS', label: 'NodeJS', group: 'toolsAndFrameworks' },
+  { id: 'Python', label: 'Python', group: 'toolsAndFrameworks' },
+  { id: 'React', label: 'React', group: 'toolsAndFrameworks' },
+  { id: 'React Native', label: 'React Native', group: 'toolsAndFrameworks' },
+  { id: "REST API's", label: "REST API's", group: 'toolsAndFrameworks' },
+  { id: 'Salesforce', label: 'Salesforce', group: 'toolsAndFrameworks' },
+  { id: 'Selenium', label: 'Selenium', group: 'toolsAndFrameworks' },
+  { id: 'Sketch', label: 'Sketch', group: 'toolsAndFrameworks' },
+  { id: 'SQL', label: 'SQL', group: 'toolsAndFrameworks' },
+  { id: 'Xray', label: 'Xray', group: 'toolsAndFrameworks' },
+  { id: 'Zephyr', label: 'Zephyr', group: 'toolsAndFrameworks' },
+  { id: 'VMWare', label: 'VMWare', group: 'toolsAndFrameworks' },
+  { id: 'Virtual Box', label: 'Virtual Box', group: 'toolsAndFrameworks' },
+] as const
+
+export type MentoringTopicKey = typeof MENTORING_TOPICS[number]['id']
+export type MentoringTopicLabel = typeof MENTORING_TOPICS[number]['label']
+
+export const MENTORING_TOPICS_MAP = Object.fromEntries(
+  MENTORING_TOPICS.map((topic) => [topic.id, topic.label])
+) as Record<MentoringTopicKey, MentoringTopicLabel>
+
+// TODO: these are the **old** 'categories' (i.e. mentoring topics). To be deleted after
+// we migrate to the above!
+export const CATEGORY_GROUPS = {
+  softwareEngineering: '👩‍💻 Software Engineering',
+  design: '🎨 Design',
+  otherProfessions: '🏄‍♀️ Other Professions',
+  careerSupport: '✋ Career Support',
+  language: '🗣️ Language Support',
+  other: '🤗 Other',
+} as const
+
+export const CATEGORIES = [
+  {
+    id: 'basicProgrammingSkills',
+    label: 'Basic programming skills',
+    group: 'softwareEngineering',
+  },
+  { id: 'htmlCss', label: 'HTML & CSS', group: 'softwareEngineering' },
+  { id: 'javascript', label: 'Javascript', group: 'softwareEngineering' },
+  { id: 'react', label: 'React', group: 'softwareEngineering' },
+  { id: 'java', label: 'Java', group: 'softwareEngineering' },
+  { id: 'python', label: 'Python', group: 'softwareEngineering' },
+  {
+    id: 'dataAnalytics',
+    label: 'Data Analytics',
+    group: 'softwareEngineering',
+  },
+  {
+    id: 'machineLearning',
+    label: 'Machine Learning',
+    group: 'softwareEngineering',
+  },
+  {
+    id: 'mobileDevelopmentIos',
+    label: 'iOS Mobile Development',
+    group: 'softwareEngineering',
+  },
+  {
+    id: 'mobileDevelopmentAndroid',
+    label: 'Android Mobile Development',
+    group: 'softwareEngineering',
+  },
+  { id: 'salesforce', label: 'Salesforce', group: 'softwareEngineering' },
+  {
+    id: 'devOpsCloud',
+    label: 'DevOps and Cloud (e.g. Azure, AWS)',
+    group: 'softwareEngineering',
+  },
+  { id: 'iot', label: 'IoT', group: 'softwareEngineering' },
+  {
+    id: 'computerNetworking',
+    label: 'Computer Networking',
+    group: 'softwareEngineering',
+  },
+  { id: 'blockchain', label: 'Blockchain', group: 'softwareEngineering' },
+  {
+    id: 'productManagement',
+    label: 'Product Management',
+    group: 'otherProfessions',
+  },
+  {
+    id: 'projectManagement',
+    label: 'Project Management',
+    group: 'otherProfessions',
+  },
+  {
+    id: 'digitalMarketing',
+    label: 'Digital Marketing',
+    group: 'otherProfessions',
+  },
+  {
+    id: 'businessDevelopment',
+    label: 'Business Development',
+    group: 'otherProfessions',
+  },
+  { id: 'sales', label: 'Sales', group: 'otherProfessions' },
+  {
+    id: 'qualityAssurance',
+    label: 'Quality Assurance',
+    group: 'otherProfessions',
+  },
+  { id: 'basicGerman', label: 'Basic German 🇩🇪', group: 'language' },
+  { id: 'businessGerman', label: 'Business German 🇩🇪', group: 'language' },
+  { id: 'english', label: 'English 🇬🇧', group: 'language' },
+  { id: 'graphicDesign', label: 'Graphic Design', group: 'design' },
+  {
+    id: 'userInterfaceDesign',
+    label: 'User Interface Design',
+    group: 'design',
+  },
+  {
+    id: 'userExperienceDesign',
+    label: 'User Experience Design',
+    group: 'design',
+  },
+  {
+    id: 'motivationAndEncouragement',
+    label: 'Motivation & encouragement',
+    group: 'other',
+  },
+  { id: 'friendAndHelp', label: 'Be a friend and help', group: 'other' },
+  { id: 'dontKnowYet', label: "I don't know yet", group: 'other' },
+  {
+    id: 'careerOrientationAndPlanning',
+    label: 'Career orientation & planning',
+    group: 'careerSupport',
+  },
+  {
+    id: 'internshipOrWorkingStudent',
+    label: 'Internship / working student position search',
+    group: 'careerSupport',
+  },
+  { id: 'jobSearch', label: 'Job search', group: 'careerSupport' },
+  {
+    id: 'jobApplicationsCvPreparationEnglish',
+    label: 'Job applications and CV preparation in English',
+    group: 'careerSupport',
+  },
+  {
+    id: 'jobApplicationsCvPreparationGerman',
+    label: 'Job applications and CV preparation in German',
+    group: 'careerSupport',
+  },
+  {
+    id: 'interviewPreparation',
+    label: 'Interview preparation',
+    group: 'careerSupport',
+  },
+  {
+    id: 'codingChallengePreparation',
+    label: 'Coding challenge preparation',
+    group: 'careerSupport',
+  },
+  {
+    id: 'buildingProfessionalNetwork',
+    label: 'Building a professional network',
+    group: 'careerSupport',
+  },
+  { id: 'entrepreneurship', label: 'Entrepreneurship', group: 'careerSupport' },
+  { id: 'freelancing', label: 'Freelancing', group: 'careerSupport' },
+] as const
+export type CategoryKey = typeof CATEGORIES[number]['id']
+export type CategoryLabel = typeof CATEGORIES[number]['label']
+
+export const CATEGORIES_MAP = Object.fromEntries(
+  CATEGORIES.map((cat) => [cat.id, cat.label])
+) as Record<CategoryKey, CategoryLabel>
diff --git a/libs/shared-types/src/lib/RedProfile.ts b/libs/shared-types/src/lib/RedProfile.ts
index 17e327625..ed2737ac1 100644
--- a/libs/shared-types/src/lib/RedProfile.ts
+++ b/libs/shared-types/src/lib/RedProfile.ts
@@ -10,6 +10,9 @@ import {
   GenderKey,
   Language,
   MenteeOccupationCategoryKey,
+  MentoringGoalKey,
+  MentoringTopicKey,
+  FieldOfExperienceKey,
 } from '@talent-connect/shared-config'
 
 export type RedProfile = {
@@ -51,6 +54,18 @@ export type RedProfile = {
   favouritedRedProfileIds: Array<string>
   optOutOfMenteesFromOtherRediLocation: boolean
 
+  mentor_mentoringTopics: Array<MentoringTopicKey>
+  mentor_mentoringGoals: Array<MentoringGoalKey>
+  mentor_professionalExperienceFields: Array<FieldOfExperienceKey>
+
+  mentee_mentoringGoal: MentoringGoalKey
+  mentee_overarchingMentoringTopics: Array<MentoringTopicKey>
+  mentee_primaryRole_fieldOfExpertise: FieldOfExperienceKey
+  mentee_primaryRole_mentoringTopics: Array<MentoringTopicKey>
+  mentee_secondaryRole_fieldOfExpertise: FieldOfExperienceKey
+  mentee_secondaryRole_mentoringTopics: Array<MentoringTopicKey>
+  mentee_toolsAndFrameworks_mentoringTopics: Array<MentoringTopicKey>
+
   createdAt: Date
   updatedAt: Date
   userActivated?: boolean