diff --git a/Epsilon.Abstractions/Component/ICompetenceProfileConverter.cs b/Epsilon.Abstractions/Component/ICompetenceProfileConverter.cs
deleted file mode 100644
index 12bb7b0d..00000000
--- a/Epsilon.Abstractions/Component/ICompetenceProfileConverter.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Epsilon.Abstractions.Model;
-using Epsilon.Canvas.Abstractions.Model;
-using Epsilon.Canvas.Abstractions.Model.GraphQl;
-using Epsilon.Canvas.Abstractions.QueryResponse;
-
-namespace Epsilon.Abstractions.Component;
-
-public interface ICompetenceProfileConverter
-{
-    public CompetenceProfile ConvertFrom(GetAllUserCoursesSubmissionOutcomes getAllUserCoursesSubmissionOutcomes,IHboIDomain domain, IEnumerable<EnrollmentTerm> terms);
-}
\ No newline at end of file
diff --git a/Epsilon.Abstractions/Model/CompetenceProfile.cs b/Epsilon.Abstractions/Model/CompetenceProfile.cs
deleted file mode 100644
index 096eb4fb..00000000
--- a/Epsilon.Abstractions/Model/CompetenceProfile.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Epsilon.Canvas.Abstractions.Model;
-
-namespace Epsilon.Abstractions.Model;
-
-public record CompetenceProfile(
-    IHboIDomain HboIDomain,
-    IEnumerable<ProfessionalTaskResult> ProfessionalTaskOutcomes,
-    IEnumerable<ProfessionalSkillResult> ProfessionalSkillOutcomes,
-    IEnumerable<EnrollmentTerm> Terms,
-    IEnumerable<DecayingAveragePerLayer> DecayingAveragesPerTask,
-    IEnumerable<DecayingAveragePerSkill> DecayingAveragesPerSkill
-);
\ No newline at end of file
diff --git a/Epsilon.Canvas.Abstractions/Model/EnrollmentTermCollection.cs b/Epsilon.Canvas.Abstractions/Model/EnrollmentTermCollection.cs
index c53eb04e..184a382f 100644
--- a/Epsilon.Canvas.Abstractions/Model/EnrollmentTermCollection.cs
+++ b/Epsilon.Canvas.Abstractions/Model/EnrollmentTermCollection.cs
@@ -1,5 +1,4 @@
-using System.Collections;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Epsilon.Canvas.Abstractions.Model;
 
diff --git a/Epsilon.Canvas.Abstractions/Model/GraphQl/AssessmentRating.cs b/Epsilon.Canvas.Abstractions/Model/GraphQl/AssessmentRating.cs
index f5cae158..8d570e6a 100644
--- a/Epsilon.Canvas.Abstractions/Model/GraphQl/AssessmentRating.cs
+++ b/Epsilon.Canvas.Abstractions/Model/GraphQl/AssessmentRating.cs
@@ -3,6 +3,9 @@
 namespace Epsilon.Canvas.Abstractions.Model.GraphQl;
 
 public record AssessmentRating(
-    [property: JsonPropertyName("points")] double? Points,
-    [property: JsonPropertyName("outcome")] Outcome? Outcome
-);
\ No newline at end of file
+    [property: JsonPropertyName("criterion")] Criterion? Criterion,
+    [property: JsonPropertyName("points")] double? Points
+)
+{
+    public bool IsMastery => Points >= Criterion?.MasteryPoints;
+}
\ No newline at end of file
diff --git a/Epsilon.Canvas.Abstractions/Model/GraphQl/Assignment.cs b/Epsilon.Canvas.Abstractions/Model/GraphQl/Assignment.cs
index af584ad5..ebc20383 100644
--- a/Epsilon.Canvas.Abstractions/Model/GraphQl/Assignment.cs
+++ b/Epsilon.Canvas.Abstractions/Model/GraphQl/Assignment.cs
@@ -4,5 +4,6 @@ namespace Epsilon.Canvas.Abstractions.Model.GraphQl;
 
 public record Assignment(
     [property: JsonPropertyName("name")] string? Name, 
-    [property: JsonPropertyName("modules")] List<Module>? Modules 
+    [property: JsonPropertyName("modules")] IEnumerable<Module>? Modules ,
+    [property: JsonPropertyName("rubric")] Rubric? Rubric 
 );
\ No newline at end of file
diff --git a/Epsilon.Canvas.Abstractions/Model/GraphQl/Outcome.cs b/Epsilon.Canvas.Abstractions/Model/GraphQl/Outcome.cs
index d4ecff00..6bdbd704 100644
--- a/Epsilon.Canvas.Abstractions/Model/GraphQl/Outcome.cs
+++ b/Epsilon.Canvas.Abstractions/Model/GraphQl/Outcome.cs
@@ -4,6 +4,5 @@ namespace Epsilon.Canvas.Abstractions.Model.GraphQl;
 
 public record Outcome(
     [property: JsonPropertyName("_id")] int Id,
-    [property: JsonPropertyName("title")] string? Title,
-    [property: JsonPropertyName("masteryPoints")] double? MasteryPoints
+    [property: JsonPropertyName("title")] string Title
 );
\ No newline at end of file
diff --git a/Epsilon.Canvas.Abstractions/Model/GraphQl/RubricAssessmentNode.cs b/Epsilon.Canvas.Abstractions/Model/GraphQl/RubricAssessmentNode.cs
index 7381f0bb..e2f0ef08 100644
--- a/Epsilon.Canvas.Abstractions/Model/GraphQl/RubricAssessmentNode.cs
+++ b/Epsilon.Canvas.Abstractions/Model/GraphQl/RubricAssessmentNode.cs
@@ -3,6 +3,5 @@
 namespace Epsilon.Canvas.Abstractions.Model.GraphQl;
 
 public record RubricAssessmentNode(
-    [property: JsonPropertyName("assessmentRatings")] List<AssessmentRating>? AssessmentRatings, 
-    [property: JsonPropertyName("user")] User? User
+    [property: JsonPropertyName("assessmentRatings")] IReadOnlyList<AssessmentRating?>? AssessmentRatings
 );
\ No newline at end of file
diff --git a/Epsilon.Canvas.Abstractions/Model/GraphQl/RubricAssessmentsConnection.cs b/Epsilon.Canvas.Abstractions/Model/GraphQl/RubricAssessmentsConnection.cs
index a68992fd..0c01078e 100644
--- a/Epsilon.Canvas.Abstractions/Model/GraphQl/RubricAssessmentsConnection.cs
+++ b/Epsilon.Canvas.Abstractions/Model/GraphQl/RubricAssessmentsConnection.cs
@@ -3,5 +3,5 @@
 namespace Epsilon.Canvas.Abstractions.Model.GraphQl;
 
 public record RubricAssessmentsConnection(
-    [property: JsonPropertyName("nodes")] List<RubricAssessmentNode>? Nodes
+    [property: JsonPropertyName("nodes")] IEnumerable<RubricAssessmentNode>? Nodes
 );
\ No newline at end of file
diff --git a/Epsilon.Canvas.Abstractions/Model/GraphQl/SubmissionsConnectionNode.cs b/Epsilon.Canvas.Abstractions/Model/GraphQl/SubmissionsConnectionNode.cs
index 5ed7dfd6..013fdbb2 100644
--- a/Epsilon.Canvas.Abstractions/Model/GraphQl/SubmissionsConnectionNode.cs
+++ b/Epsilon.Canvas.Abstractions/Model/GraphQl/SubmissionsConnectionNode.cs
@@ -3,8 +3,8 @@
 namespace Epsilon.Canvas.Abstractions.Model.GraphQl;
 
 public record SubmissionsConnectionNode(
-    [property: JsonPropertyName("updatedAt")] DateTime? UpdatedAt,
     [property: JsonPropertyName("postedAt")] DateTime? PostedAt,
-    [property: JsonPropertyName("assignment")] Assignment? Assignment, 
-    [property: JsonPropertyName("rubricAssessmentsConnection")] RubricAssessmentsConnection? RubricAssessmentsConnection
+    [property: JsonPropertyName("assignment")] Assignment? Assignment,
+    [property: JsonPropertyName("submissionHistoriesConnection")] SubmissionsHistoriesConnection SubmissionsHistories,
+    [property: JsonPropertyName("rubricAssessmentsConnection")] RubricAssessmentsConnection RubricAssessmentsConnection
 );
\ No newline at end of file
diff --git a/Epsilon.Canvas.Abstractions/Model/OutcomeResultCollection.cs b/Epsilon.Canvas.Abstractions/Model/OutcomeResultCollection.cs
index 09e169c2..9cbf3ac6 100644
--- a/Epsilon.Canvas.Abstractions/Model/OutcomeResultCollection.cs
+++ b/Epsilon.Canvas.Abstractions/Model/OutcomeResultCollection.cs
@@ -6,20 +6,4 @@ public record OutcomeResultCollection(
     [property: JsonPropertyName("outcome_results")]
     IEnumerable<OutcomeResult> OutcomeResults,
     [property: JsonPropertyName("linked")] OutcomeResultCollectionLink? Links
-)
-{
-    public double GetDecayingAverage()
-    {
-        var decayingAverage = 0.0;
-        
-        foreach(var grade in OutcomeResults)
-        {
-            if (grade.Score != null)
-            {
-                decayingAverage = decayingAverage * 0.35 + grade.Score.Value * 0.65;
-            }
-        }
-
-        return decayingAverage;
-    }
-}
\ No newline at end of file
+);
\ No newline at end of file
diff --git a/Epsilon.Canvas.Abstractions/QueryResponse/GetAllUserCoursesSubmissionOutcomes.cs b/Epsilon.Canvas.Abstractions/QueryResponse/GetAllUserCoursesSubmissionOutcomes.cs
deleted file mode 100644
index 35b61f2b..00000000
--- a/Epsilon.Canvas.Abstractions/QueryResponse/GetAllUserCoursesSubmissionOutcomes.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Text.Json.Serialization;
-using Epsilon.Canvas.Abstractions.Model.GraphQl;
-
-namespace Epsilon.Canvas.Abstractions.QueryResponse;
-
-public record GetAllUserCoursesSubmissionOutcomes(
-    [property: JsonPropertyName("data")] GetAllUserCoursesSubmissionOutcomes.CourseData? Data
-)
-{
-    public record CourseData(
-        [property: JsonPropertyName("allCourses")] List<Course>? Courses
-    );
-};
\ No newline at end of file
diff --git a/Epsilon.Canvas.Abstractions/QueryResponse/GetUserCourseSubmissionOutcomes.cs b/Epsilon.Canvas.Abstractions/QueryResponse/GetUserCourseSubmissionOutcomes.cs
deleted file mode 100644
index 785035d7..00000000
--- a/Epsilon.Canvas.Abstractions/QueryResponse/GetUserCourseSubmissionOutcomes.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using System.Text.Json.Serialization;
-using Epsilon.Canvas.Abstractions.Model.GraphQl;
-
-namespace Epsilon.Canvas.Abstractions.QueryResponse;
-
-public record GetUserCourseSubmissionOutcomes(
-    [property: JsonPropertyName("data")] GetUserCourseSubmissionOutcomes.CourseData? Data
-)
-{
-    public record CourseData(
-        [property: JsonPropertyName("course")] Course? Course
-    );
-};
\ No newline at end of file
diff --git a/Epsilon.Host.Frontend/src/components/Competance/KpiMatrix.vue b/Epsilon.Host.Frontend/src/components/Competance/KpiMatrix.vue
deleted file mode 100644
index 4f3b9d57..00000000
--- a/Epsilon.Host.Frontend/src/components/Competance/KpiMatrix.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-  <apexchart
-    type="bar"
-    height="350"
-    :options="chartOptions"
-    :series="series"
-  />
-</template>
-
-<script lang="ts" setup>
-import apexchart from "vue3-apexcharts";
-import {HboIDomain} from "@/logic/Api";
-import {ref, watch} from "vue";
-const series = []
-const chartOptions = {
-    annotations: {
-        yaxis: [
-            {
-                y: 40,
-                borderColor: 'red',
-                strokeDashArray: 0,
-                label: {
-                    borderColor: 'red',
-                    style: {
-                        color: '#fff',
-                        background: 'red'
-                    },
-                    text: 'Mastery'
-                }
-            }
-        ]
-    },
-    colors:[],
-        chart: {
-        type: 'bar',
-            height: 350,
-            stacked: true,
-            toolbar: {
-            show: false
-        },
-        zoom: {
-            enabled: false
-        }
-    },
-    dataLabels: {
-        enabled: false
-    },
-    plotOptions: {
-        bar: {
-            horizontal: false,
-                borderRadius: 4,
-                dataLabels: {
-            }
-        },
-    },
-    xaxis: {
-        type: 'string',
-            categories: [],
-    },
-    yaxis:{
-        show: false,
-    },
-    legend: {
-        position: 'bottom'
-    },
-    fill: {
-        opacity: 1
-    },
-    tooltip:{
-        enabled: false
-    }
-}
-
-const props = defineProps<{
-    domain: HboIDomain
-}>()
-
-for (const ac in props.domain.activities) {
-    chartOptions.xaxis.categories.push(props.domain.activities[ac].name as never)
-}
-
-for (const i in props.domain.architectureLayers) {
-    console.log(i)
-    const ar = props.domain.architectureLayers[i]
-    console.log(ar)
-    series.push({
-        name: ar.name,
-        color: ar.color,
-        data: [
-            Math.random(),
-            Math.random(),
-            Math.random(),
-            Math.random(),
-            Math.random(),
-        ]
-    })
-}
-</script>
-
-<style scoped>
-
-</style>
diff --git a/Epsilon.Host.Frontend/src/components/Competance/KpiTable.vue b/Epsilon.Host.Frontend/src/components/Competance/KpiTable.vue
deleted file mode 100644
index dfaea46e..00000000
--- a/Epsilon.Host.Frontend/src/components/Competance/KpiTable.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <table v-if="!!props.data">
-    <thead>
-      <tr>
-        <td />
-        <th v-for="activity of props.domain.activities">
-          {{ activity.name }}
-        </th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr v-for="(architectureLayer , i) of props.domain.architectureLayers">
-        <th>{{ architectureLayer.name }}</th>
-        <td
-          v-for="(_, x) of props.domain.activities"
-          :style="{backgroundColor: getCellColor(i, x)?.color}"
-        >
-          {{ getKpis(i, x).length }}
-        </td>
-      </tr>
-    </tbody>
-  </table>
-</template>
-
-<script lang="ts" setup>
-import {HboIDomain, MasteryLevel, ProfessionalTaskOutcome} from "@/logic/Api";
-
-const props = defineProps<{
-    domain: HboIDomain
-    data: ProfessionalTaskOutcome[]
-}>()
-
-
-function getKpis(arId: string, acId: string): ProfessionalTaskOutcome[] {
-    return props.data.filter(o => o.architectureLayer === parseInt(arId) && o.activity === parseInt(acId))
-}
-
-function getCellColor(arId: string, acId: string): MasteryLevel | undefined {
-    const kpis = getKpis(arId, acId).sort((a, b) => {
-        return props.domain.masteryLevels?.find(masteryLevel => masteryLevel.id == b?.masteryLevel).level - props.domain.masteryLevels?.find(ml => ml.id == a?.masteryLevel).level
-    })
-
-    return props.domain.masteryLevels.find(masteryLevel => masteryLevel.id == kpis[0]?.masteryLevel)
-}
-</script>
-
-<style>
-tbody tr th {
-    text-align: left;
-}
-
-tbody tr td {
-    padding: 8px;
-    min-width: 100px;
-}
-
-tbody tr {
-    border-bottom: 2px solid black;
-}
-
-tbody td {
-    border: 2px solid black;
-}
-
-table {
-    border-collapse: collapse;
-}
-
-thead th {
-
-}
-</style>
diff --git a/Epsilon.Host.Frontend/src/components/Competance/PersonalDevelopmentMatrix.vue b/Epsilon.Host.Frontend/src/components/Competance/PersonalDevelopmentMatrix.vue
deleted file mode 100644
index 2de16a80..00000000
--- a/Epsilon.Host.Frontend/src/components/Competance/PersonalDevelopmentMatrix.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-    <apexcharts type="bar" :options="chartOptions" :series="series"></apexcharts>
-</template>
-
-<script lang="ts" setup>
-import {HboIDomain, ProfessionalTaskOutcome} from "@/logic/Api";
-import {watch} from "vue";
-
-const props = defineProps<{
-    domain: HboIDomain
-    data: ProfessionalTaskOutcome[]
-}>()
-
-const series = [{
-    name: '',
-    data: [44, 55, 41, 67]
-}
-]
-const chartOptions = {
-    annotations: {
-        yaxis: [
-            {
-                y: 40,
-                borderColor: 'red',
-                strokeDashArray: 0,
-                label: {
-                    borderColor: 'red',
-                    style: {
-                        color: '#fff',
-                        background: 'red'
-                    },
-                    text: 'Mastery'
-                }
-            }
-        ]
-    },
-    colors: ["#A8D08D"],
-    chart: {
-        type: 'bar',
-        stacked: true,
-        toolbar: {
-            show: false
-        },
-        zoom: {
-            enabled: false
-        }
-    },
-    dataLabels: {
-        enabled: false
-    },
-    plotOptions: {
-        bar: {
-            horizontal: false,
-            borderRadius: 4,
-            dataLabels: {}
-        },
-    },
-    xaxis: {
-        type: 'string',
-        categories: [],
-    },
-    yaxis: {
-        show: false,
-    },
-    legend: {
-        position: 'bottom'
-    },
-    fill: {
-        opacity: 1
-    },
-    tooltip: {
-        enabled: false
-    }
-}
-
-watch
-(() => props.domain, () => {
-    for (const pd in props.domain.professionalSkills) {
-        chartOptions.xaxis.categories.push(props.domain.professionalSkills?.[pd].name)
-    }
-})
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/Epsilon.Tests/Epsilon.Tests.csproj b/Epsilon.Tests/Epsilon.Tests.csproj
index 21b261e1..e17df0cb 100644
--- a/Epsilon.Tests/Epsilon.Tests.csproj
+++ b/Epsilon.Tests/Epsilon.Tests.csproj
@@ -33,8 +33,4 @@
         <ProjectReference Include="..\Epsilon\Epsilon.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <Folder Include="Exporters\"/>
-    </ItemGroup>
-
 </Project>
diff --git a/Epsilon/Component/Converters/CompetenceProfileConverter.cs b/Epsilon/Component/Converters/CompetenceProfileConverter.cs
deleted file mode 100644
index c30cbff6..00000000
--- a/Epsilon/Component/Converters/CompetenceProfileConverter.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using Epsilon.Abstractions.Component;
-using Epsilon.Abstractions.Model;
-using Epsilon.Canvas.Abstractions.Model;
-using Epsilon.Canvas.Abstractions.Model.GraphQl;
-using Epsilon.Canvas.Abstractions.QueryResponse;
-
-namespace Epsilon.Component.Converters;
-
-public class CompetenceProfileConverter : ICompetenceProfileConverter
-{
-    public IEnumerable<DecayingAveragePerLayer> GetDecayingAverageTasks(IHboIDomain domain, IEnumerable<ProfessionalTaskResult> taskResults)
-    {
-        return domain.ArchitectureLayers.Select(layer => new DecayingAveragePerLayer(layer.Id,
-            domain.Activities.Select(activity =>
-            {
-                var decayingAverage = taskResults
-                    .Where(task => task.ArchitectureLayer == layer.Id && task.Activity == activity.Id)
-                    .Aggregate<ProfessionalTaskResult, double>(0,
-                        (current, outcome) => current * 0.35 + outcome.Grade * 0.65);
-
-                return new DecayingAveragePerActivity(activity.Id, decayingAverage);
-            })));
-    }
-
-    public IEnumerable<DecayingAveragePerSkill> GetDecayingAverageSkills(IHboIDomain domain, IEnumerable<ProfessionalSkillResult> skillResults)
-    {
-        return domain.ProfessionalSkills.Select(skill =>
-        {
-            var decayingAverage = skillResults.Where(outcome => outcome.Skill == skill.Id)
-                .Aggregate<ProfessionalSkillResult, double>(0,
-                    (current, outcome) => current * 0.35 + outcome.Grade * 0.65);
-
-            return new DecayingAveragePerSkill(skill.Id, decayingAverage);
-        });
-    }
-
-    public CompetenceProfile ConvertFrom(GetAllUserCoursesSubmissionOutcomes getAllUserCoursesSubmissionOutcomes,
-        IHboIDomain domain, IEnumerable<EnrollmentTerm> enrollmentTerms)
-    {
-        var taskResults = new List<ProfessionalTaskResult>();
-        var professionalResults = new List<ProfessionalSkillResult>();
-
-        foreach (var course in getAllUserCoursesSubmissionOutcomes.Data.Courses)
-        {
-            foreach (var submission in course.SubmissionsConnection.Nodes.Where(static s => s.PostedAt != null))
-            {
-                var assessmentRatings = submission.RubricAssessmentsConnection?.Nodes;
-
-                foreach (var assessmentRating in assessmentRatings)
-                {
-                    foreach (var (points, outcome) in assessmentRating.AssessmentRatings.Where(static ar =>
-                                 ar is {Points: not null, Outcome: not null} && ar.Points >= ar.Outcome.MasteryPoints))
-                    {
-                        if (FhictConstants.ProfessionalTasks.TryGetValue(outcome!.Id, out var professionalTask))
-                        {
-                            taskResults.Add(
-                                new ProfessionalTaskResult(
-                                    professionalTask.Layer,
-                                    professionalTask.Activity,
-                                    professionalTask.MasteryLevel,
-                                    points!.Value,
-                                    submission.PostedAt!.Value
-                                )
-                            );
-                        }
-                        else if (FhictConstants.ProfessionalSkills.TryGetValue(outcome.Id, out var professionalSkill))
-                        {
-                            professionalResults.Add(
-                                new ProfessionalSkillResult(
-                                    professionalSkill.Skill,
-                                    professionalSkill.MasteryLevel,
-                                    points!.Value,
-                                    submission.PostedAt!.Value
-                                )
-                            );
-                        }
-                    }
-                }
-            }
-        }
-
-        var filteredTerms = enrollmentTerms
-            .Where(static term => term is {StartAt: not null, EndAt: not null})
-            .Where(term => taskResults.Any(taskOutcome =>
-                               taskOutcome.AssessedAt >= term.StartAt && taskOutcome.AssessedAt <= term.EndAt)
-                           || professionalResults.Any(skillOutcome =>
-                               skillOutcome.AssessedAt > term.StartAt && skillOutcome.AssessedAt < term.EndAt))
-            .Distinct()
-            .OrderBy(static term => term.StartAt);
-
-        return new CompetenceProfile(
-            domain,
-            taskResults,
-            professionalResults,
-            filteredTerms,
-            GetDecayingAverageTasks(domain, taskResults),
-            GetDecayingAverageSkills(domain, professionalResults)
-        );
-    }
-}
\ No newline at end of file