diff --git a/elixir_libs/testflow/lib/testflow.ex b/elixir_libs/testflow/lib/testflow.ex
new file mode 100644
index 0000000..daf3346
--- /dev/null
+++ b/elixir_libs/testflow/lib/testflow.ex
@@ -0,0 +1,257 @@
+defmodule Testflow do
+  @moduledoc """
+  Documentation for Testflow.
+  """
+
+  @doc """
+  Hello world.
+
+  ## Examples
+
+      iex> Testflow.hello()
+      :world
+
+  """
+  def hello do
+    :world
+  end
+
+  def get_key_valpress(tup) do
+    k = cond do
+      {{{y,mo,d},{h,m,s}},p,tmp} = tup ->
+        # %{ {h*60 + m} => [p] }
+        # %{ (h*60 + m) => [p] }
+        [(h*60 + m),p]
+        # {h*60 + m, p}
+        # h
+    end
+  end
+
+  # def get_key_valpress(timepress) do
+  #   k = cond do
+  #     {t,p} = timepress ->
+  #       # %{ {h*60 + m} => [p] }
+  #       # %{ {h*60 + m} => [p] }
+  #       [{h*60 + m, p}]
+  #       # h
+  #   end
+  # end
+
+  # def merge_map(map1, map2) do
+  #
+  # end
+  #
+  # def get_key_valpress(tup) do
+  #   k = cond do
+  #     {{{y,mo,d},{h,m,s}},p,tmp} = tup ->
+  #       {{h*60 + m},p,tmp}
+  #       # h
+  #   end
+  # end
+
+  def sortfun(x1,x2) do
+    {t1,c1} = x1
+    {t2,c2} = x2
+    c1 >= c2
+  end
+
+  def get_fake_val do
+      hour_offset = Enum.random(1..24)
+      minute_offset = Enum.random(1..60)
+      second_offset = Enum.random(1..60)
+      press_absolute_offset = Enum.random(0..20) * :rand.uniform
+      temp_absolute_offset = Enum.random(0..6) * :rand.uniform
+      signs = {Enum.random(0..1), Enum.random(0..1)}
+      {press_offset, temp_offset} = cond do
+          signs == {0,0} -> {1000 - press_absolute_offset, 28 - temp_absolute_offset}
+          signs == {0,1} -> {1000 - press_absolute_offset, 28 + temp_absolute_offset}
+          signs == {1,1} -> {1000 + press_absolute_offset, 28 + temp_absolute_offset}
+          signs == {1,0} -> {1000 + press_absolute_offset, 28 - temp_absolute_offset}
+      end
+      # {{{1988,1,1},{hour_offset, minute_offset, second_offset}}, press_offset, temp_offset}
+      {{{1988,1,1},{hour_offset, minute_offset, second_offset}}, [press_offset]}
+  end
+
+  def generate_dataset(size) do
+    for index <- Range.new(1, size), do: get_fake_val()
+  end
+
+  def mapreduce do
+    # window = Flow.Window.count(10)
+    #
+    # flow = Flow.from_enumerable(1..100) |> Flow.partition(window: window, stages: 1)
+    #
+    # timer = (:erlang.monotonic_time(:seconds))
+    # flow |> Flow.reduce(fn -> 0 end, &(&1 + &2)) |> Flow.emit(:state) |> Enum.to_list()
+    ds = generate_dataset(100000)
+
+    flow = ds |> Flow.from_enumerable(max_demand: 2000)
+    # |> Flow.partition(max_demand: 500, stages: 10) # instead of 100 and 50
+    # # |> Flow.flat_map(&get_key_valpress/1)
+    # # |> Flow.flat_map(&get_key_valpress/1)
+    # |> Flow.map(&get_key_valpress/1)
+    # |> Flow.partition(window: Flow.Window.count(100), stages: 10)
+    |> Flow.partition(max_demand: 50, stages: 1) # instead of 100 and 50
+
+    |> Flow.map(fn {t, p} -> %{t => p} end )
+    |> Flow.partition(max_demand: 50, stages: 1) # instead of 100 and 50
+    |> Flow.reduce(fn -> %{} end, fn item, map ->
+        # Map.update(map, item, [], & &1 + 1)
+        h = List.first(Map.to_list(item))
+        IO.puts("h = #{inspect h}   ")
+        t = List.first(Map.to_list(item))
+        IO.puts("t = #{inspect t}   ")
+        IO.puts("item = #{inspect item}   ")
+        Map.update(map, h, [], fn v -> v ++ [t] end)
+        # h
+        # Map.get_and_update(map, k, & &1 ++ item)
+        # m = List.foldl(flow, List.first(flow), fn x, acc ->
+        # {min,press} = item
+        # {maybeval, newmap} = Map.get_and_update(map, item,
+        #     fn current_value ->
+        #       {current_value, current_value ++ press}
+        #     end)
+        # newmap
+        # current = Map.get(map, min, default \\ nil)
+        # Map.update(map, min, min, &(&1 ++ [press]))
+        # Map.merge(item, map,
+        # fn _k, v1, v2 ->
+        #     v1 ++ v2
+        # end)
+    end)
+    |> Flow.emit(:state)
+    |> Enum.to_list()
+    # |> Flow.group_by_key()
+    # |> Flow.map_values(&Enum.sort/1)
+        # [item | list]
+    # end)
+    # |> Flow.partition(max_demand: 5000, stages: 10) # instead of 100 and 50
+    # |> Flow.map(fn tup -> )
+    # |> Enum.to_list()
+    # |> Flow.partition(window: Flow.Window.count(100), stages: 1)
+    # |> Flow.reduce(fn -> %{} end, fn item, map ->
+    #     # m = List.foldl(flow, List.first(flow), fn x, acc ->
+    #     Map.merge(item, map,
+    #     fn _k, v1, v2 ->
+    #         v1 ++ v2
+    #     end)
+    # end)
+    # |> Flow.group_by_key()
+    # |> Enum.to_list()
+    # |> Flow.partition(max_demand: 20, stages: 2) # instead of 100 and 10
+    # |> Flow.map(&index/1)
+    # |> Flow.run
+
+    # diff = (:erlang.monotonic_time(:seconds) - timer)
+    # diff
+    end
+end
+
+    #Testflow.mapreduce
+    # else
+    #   1000 + press_absolute_offset
+
+    # press_offset = unless sing == 0 do
+    #   press_absolute_offset
+    # end sign == 0, do:Map.update(map, item, [], &[&1,&2])
+    #   press_absolute_offset
+# %{{{1988,1,1},{0,9,16}} => [290.30908203125]}
+    # 0 - press_absolute_offset, else 0 + press_absolute_offset
+    # rand = {index, {hour_offset, minute_offset, second_offset}, press_offset, temp_offset}
+    # rand = {{{1988,1,1},{hour_offset, minute_offset, second_offset}}, press_offset, temp_offset}
+    # {hour_offset*60+minute_offset, press_offset}
+    # {hour_offset, press_offset}
+    # IO.puts("item = #{inspect(rand)}")
+    # map = %{:cov => -12.941094631619034,
+    #                       :measures =>
+    #                           [{{{1988,1,1},{0,9,16}},290.30908203125,31.914583333333336},
+    #                            {{{1988,1,1},{0,10,16}},1007.046630859375,31.84166666666667},
+    #                            {{{1988,1,1},{0,11,16}},290.30908203125,31.877083333333335}],
+    #                       :pmean => 529.2215983072917,:pvar => 171237.57130004966,
+    #                       :tmean => 31.877777777777787,:tvar => 0.0013295717592593033}
+    # a = %{
+    #   cov => 12.23156,
+    #   measures =>{:calendar.local_time(), 1020.1324, 33.32094}
+    #
+    # }
+    # first = Enum.to_list(Map.get(map, :measures, nil))
+    # flow = for index <- 1..10000000 do
+    # [time, press, temp]
+    # |> Enum.to_list()
+    # |> Flow.from_enumerable()
+    # flow = Flow.from_enumerable(dataset)
+    # # |> Flow.flat_map(fn tup -> Tuple.to_list(tup) end)
+    # # |> Flow.partition()
+    # # |> Flow.reduce(fn -> %{} end, fn tup, acc ->
+    # #     # {{{day,{h,m,s}},p,t} = tup
+    # #     key = get_key(tup)
+    # #     # key = h*60 + m
+    # #     Map.update(acc, key, 1, &(&1 + 1))
+    # #   end)
+    # |> Flow.group_by_key()
+    # |> Flow.emit(:state)
+    # # |> Flow.on_trigger(fn acc -> {[acc], [acc]} end)
+    # |> Enum.to_list()
+    #
+    # m = List.foldl(flow, List.first(flow), fn x, acc ->
+    #     Map.merge(x, acc,
+    #         fn _k, v1, v2 ->
+    #             v1 ++ v2
+    #         end)
+    #     end)
+    #
+    # window = Flow.Window.global()
+    # |> Flow.Window.trigger_every(10)
+    #
+    # flow = Flow.from_enumerable(1..100)
+    # |> Flow.partition(window: window, stages: 1)
+    #
+    # flow
+    # |> Flow.reduce(fn -> 0 end, &(&1 + &2))
+    # |> Flow.emit(:state)
+    # |> Enum.to_list()
+    # list = Enum.sort(flow, &sortfun(&1, &2))
+    # |> Flow.from_enumerable()
+    # |> Flow.group_by_key()
+    # |> Enum.to_list()
+    # |> Enum.map(fn tup ->
+    #   {h, sums} = tup
+    #   {h, Enum.sum(sums)}
+    # end)
+    # |> Enum.reverse()
+    # |> Enum.flat_map_reduce(acc, fun)
+    # Enum.max_by(flow, fn {t,c} -> c end)
+    # |> List.first()
+    # range = 1..1000
+    # Enum.each(range, fn(num) ->
+    #
+    # end)
+    # |> &List.first(&1)
+    # |> Stream.map(&IO.inspect(&1))
+    # File.stream!("path/to/some/file")
+    # Flow.from_enumerable(measures)
+    # |> Flow.flat_map(&String.split(&1, " "))
+    # |> Flow.each(fn tup ->
+    #   IO.puts("Tuple = #{inspect(tup)} ~n")
+    #   tup
+    # end )
+    # |> Flow.partition()
+    # |> Flow.reduce(fn -> %{} end, fn tup, acc ->
+    # end)
+    # |> Enum.to_list()
+    # |> &List.duplicate(List.first(&1), 10)
+
+
+
+
+#
+# {#{cov => -12.941094631619034,
+#                       measures =>
+#                           [{{{1988,1,1},{0,9,16}},290.30908203125,31.914583333333336},
+#                            {{{1988,1,1},{0,10,16}},1007.046630859375,31.84166666666667},
+#                            {{{1988,1,1},{0,11,16}},290.30908203125,31.877083333333335}],
+#                       pmean => 529.2215983072917,pvar => 171237.57130004966,
+#                       tmean => 31.877777777777787,tvar => 0.0013295717592593033},
+#                     [{<<166,228,1,82,63,157,221,65,102,136,185,249,206,135,
+#                         225,110,151,110,...>>,
+#                       true}]}]}
diff --git a/rebar.config b/rebar.config
index e0f2c65..c8a2a26 100644
--- a/rebar.config
+++ b/rebar.config
@@ -43,17 +43,29 @@
     ]},
     {toolchain, [
       % {root, "/home/laymer/NewGRiSP/grisp-software/rtems-install/rtems/5"}
+<<<<<<< HEAD
+      {root, "/Users/Laymer/GRiSP/grisp-software/rtems-install/rtems/5"}
+      % {root, "/Users/oxynad/Documents/thesis/newGRiSP/grisp-software/rtems-install/rtems/5"}
+      % {root, "/home/laymer/EdgeComputing/NewGRiSP/grisp-software/rtems-install/rtems/5"}
+=======
       % {root, "/Users/Laymer/GRiSP/grisp-software/rtems-install/rtems/5"}
       {root, "/Users/oxynad/Documents/thesis/newGRiSP/grisp-software/rtems-install/rtems/5"}
       % {root, "/home/laymer/EdgeComputing/NewGRiSP/grisp-software/rtems-install/rtems/5"} % W540
+>>>>>>> master
       % {root, "/media/alex/external1/grisp/grisp-software/rtems-install/rtems/5"}
     ]},
     {build, [
         {toolchain, [
           % {directory,"/home/laymer/NewGRiSP/grisp-software/rtems-install/rtems/5"}]}
+<<<<<<< HEAD
+          {directory,"/Users/Laymer/GRiSP/grisp-software/rtems-install/rtems/5"}]}
+          % {directory,"/home/laymer/EdgeComputing/NewGRiSP/grisp-software/rtems-install/rtems/5"}]} % Igor
+          % {directory,"/Users/oxynad/Documents/thesis/newGRiSP/grisp-software/rtems-install/rtems/5"}]} % Dan
+=======
           % {directory,"/Users/Laymer/GRiSP/grisp-software/rtems-install/rtems/5"}]}
           % {directory,"/home/laymer/EdgeComputing/NewGRiSP/grisp-software/rtems-install/rtems/5"}]} % W540
           {directory,"/Users/oxynad/Documents/thesis/newGRiSP/grisp-software/rtems-install/rtems/5"}]} % Dan
+>>>>>>> master
           % {directory,"/media/alex/external1/grisp/grisp-software/rtems-install/rtems/5"}]}
           % {directory,"/home/laymer/EdgeComputing/NewGRiSP/grisp-software/rtems-install/rtems/5"}]}
     ]},
diff --git a/testnodemaster.txt b/testnodemaster.txt
deleted file mode 100644
index 0c2c5f4..0000000
--- a/testnodemaster.txt
+++ /dev/null
@@ -1 +0,0 @@
-hitest