--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixResult.java	Thu Aug 16 15:47:10 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixResult.java	Thu Aug 16 16:27:53 2018 +0200
@@ -9,78 +9,30 @@
 package org.dive4elements.river.artifacts.model.fixings;
 
 import java.io.Serializable;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
 
 import org.dive4elements.river.artifacts.model.Parameters;
-import org.dive4elements.river.utils.KMIndex;
 
 public class FixResult implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
-    protected Parameters      parameters;
-    protected KMIndex<QWD []> fixings;
+    private Parameters parameters;
+
+    private FixResultColumns fixResultColumns;
 
     public FixResult() {
     }
 
-    public FixResult( final Parameters parameters, final KMIndex<QWD []> fixings ) {
+    public FixResult(final Parameters parameters, final FixResultColumns fixResultColumns) {
         this.parameters = parameters;
-        this.fixings = fixings;
-    }
-
-    public KMIndex<QWD []> getFixings() {
-        return fixings;
-    }
-
-    public void makeEventsDatesUnique() {
-        final DateUniqueMaker dum = new DateUniqueMaker();
-        
-        for (KMIndex.Entry<QWD []> entry: fixings) {
-            for (QWD ref: entry.getValue())
-                dum.makeUnique(ref);
-        }
-    }
-
-    private Collection<Integer> getEventsIndices() {
-        final TreeMap<Date, Integer> dates = new TreeMap<>();
-        
-        for (KMIndex.Entry<QWD []> entry: fixings) {
-            for (QWD value: entry.getValue())
-                dates.put(value.date, value.index);
-        }
-        
-        return dates.values();
-    }
-
-    public void remapEventIndicesToRank() {
-        final RankRemapper remapper = new RankRemapper();
-        for (Integer idx: getEventsIndices())
-            remapper.toMap(idx);
-
-        for (KMIndex.Entry<QWD []> entry: fixings) {
-            for (QWD value: entry.getValue())
-                remapper.remap(value);
-        }
-    }
-
-    public Collection<Date> getReferenceEventsDates() {
-        
-        final Set<Date> dates = new TreeSet<>();
-        
-        for (final KMIndex.Entry<QWD []> entry: fixings) {
-            for (final QWD qwd: entry.getValue())
-                dates.add(qwd.date);
-        }
-        
-        return dates;
+        this.fixResultColumns = fixResultColumns;
     }
 
     public Parameters getParameters() {
-        return parameters;
+        return this.parameters;
+    }
+
+    public FixResultColumns getFixResultColumns() {
+        return this.fixResultColumns;
     }
 }
\ No newline at end of file