diff --git a/mock-api/dafa-web/scripts/avrop.js b/mock-api/dafa-web/scripts/avrop.js
new file mode 100644
index 0000000..d28650c
--- /dev/null
+++ b/mock-api/dafa-web/scripts/avrop.js
@@ -0,0 +1,44 @@
+import faker from 'faker';
+import services from './services.js';
+import languages from './languages.js';
+import organizations from './organizations.js';
+import kommuner from './kommuner.js';
+
+faker.locale = 'sv';
+
+const SERVICES = services.generate();
+const SUPORTLANGUAGES = languages.generate();
+const TRACK = ['a', 'b', 'c'];
+const ORGANIZATIONS = organizations.generate();
+const KOMMUNER = kommuner.generate();
+
+function generateIncomingAvrop(amount = 10) {
+  const avropList = [];
+  const language = SUPORTLANGUAGES[Math.floor(Math.random() * SUPORTLANGUAGES.length)];
+
+  for (let i = 1; i <= amount; ++i) {
+    const avrop = {
+      id: faker.datatype.uuid(),
+      firstName: faker.name.firstName(),
+      lastName: faker.name.lastName(),
+      service: SERVICES[Math.floor(Math.random() * SERVICES.length)].name,
+      track: TRACK[Math.floor(Math.random() * TRACK.length)],
+      errandNumber: faker.datatype.number({ min: 100000, max: 999999 }),
+      startDate: faker.date.recent(),
+      endDate: faker.date.future(),
+      //handleBefore: faker.date.soon(),
+      supportLanguage: language.name,
+      interpreter: language.name,
+      organization: ORGANIZATIONS[Math.floor(Math.random() * ORGANIZATIONS.length)],
+      kommun: KOMMUNER[Math.floor(Math.random() * KOMMUNER.length)].kommun,
+    };
+    avropList.push({ ...avrop, fullName: `${avrop.firstName} ${avrop.lastName}` });
+  }
+
+  console.info('Incoming avrop generated...', avropList);
+  return avropList;
+}
+
+export default {
+  generate: generateIncomingAvrop,
+};
diff --git a/mock-api/dafa-web/scripts/generate-api.js b/mock-api/dafa-web/scripts/generate-api.js
index a5906cd..399c229 100644
--- a/mock-api/dafa-web/scripts/generate-api.js
+++ b/mock-api/dafa-web/scripts/generate-api.js
@@ -6,6 +6,7 @@ import kommuner from './kommuner.js';
 import languages from './languages.js';
 import organizations from './organizations.js';
 import participants from './participants.js';
+import avrop from './avrop.js';
 import services from './services.js';
 import { authTokens } from './auth-tokens.js';
 
@@ -17,6 +18,7 @@ const apiData = {
   employees: generatedEmployees,
   kommuner: kommuner.generate(),
   organizations: organizations.generate(),
+  avrop: avrop.generate(3),
   participants: participants.generate(50).map(participant => ({
     ...participant,
     employeeId: generatedEmployees[Math.floor(Math.random() * generatedEmployees.length)].id,
diff --git a/mock-api/dafa-web/scripts/organizations.js b/mock-api/dafa-web/scripts/organizations.js
index 2e47ef9..b21d56e 100644
--- a/mock-api/dafa-web/scripts/organizations.js
+++ b/mock-api/dafa-web/scripts/organizations.js
@@ -11,6 +11,13 @@ function generateOrganizations(amount = 10) {
   for (let i = 1; i <= amount; ++i) {
     organizations.push({
       id: faker.datatype.uuid(),
+      organizationNumber: `${faker.datatype.number({ 
+        min: 100000, 
+        max: 999999
+      })}-${faker.datatype.number({ 
+        min: 1000, 
+        max: 9999
+       })}`,
       name: faker.company.companyName(),
       kaNumber: faker.datatype.number({ min: 100000, max: 999999 }),
       address: {