diff --git a/HW3/CodeBlocks Fast Verifications/FFT Test/FFT Test.depend b/HW3/CodeBlocks Fast Verifications/FFT Test/FFT Test.depend
index a7566d4..0608b27 100644
--- a/HW3/CodeBlocks Fast Verifications/FFT Test/FFT Test.depend	
+++ b/HW3/CodeBlocks Fast Verifications/FFT Test/FFT Test.depend	
@@ -1,19 +1,37 @@
 # depslib dependency file v1.0
 1544366338 source:/home/shaqfa/Desktop/CourseHW/SP4EHW_IM/HW3/CodeBlocks Fast Verifications/FFT Test/main.cpp
 	<iostream>
 	"fft.h"
 	"matrix.h"
 	<gtest/gtest.h>
 
 1544366410 /home/shaqfa/Desktop/CourseHW/SP4EHW_IM/HW3/CodeBlocks Fast Verifications/FFT Test/include/fft.h
 	"matrix.h"
 	<fftw3.h>
 	<complex>
 
 1544295263 /home/shaqfa/Desktop/CourseHW/SP4EHW_IM/HW3/CodeBlocks Fast Verifications/FFT Test/include/matrix.h
 	<algorithm>
 	<array>
 	<tuple>
 	<vector>
 	<complex>
 
+1544296682 source:/home/igtomic/SP4EHW/SP4EHW_IM/HW3/CodeBlocks Fast Verifications/FFT Test/main.cpp
+	<iostream>
+	"fft.h"
+	"matrix.h"
+	<gtest/gtest.h>
+
+1544303585 /home/igtomic/SP4EHW/SP4EHW_IM/HW3/CodeBlocks Fast Verifications/FFT Test/include/fft.h
+	"matrix.h"
+	<fftw3.h>
+	<complex>
+
+1544296682 /home/igtomic/SP4EHW/SP4EHW_IM/HW3/CodeBlocks Fast Verifications/FFT Test/include/matrix.h
+	<algorithm>
+	<array>
+	<tuple>
+	<vector>
+	<complex>
+
diff --git a/HW3/CodeBlocks Fast Verifications/FFT Test/FFT Test.layout b/HW3/CodeBlocks Fast Verifications/FFT Test/FFT Test.layout
index 209ea9c..683a4e8 100644
--- a/HW3/CodeBlocks Fast Verifications/FFT Test/FFT Test.layout	
+++ b/HW3/CodeBlocks Fast Verifications/FFT Test/FFT Test.layout	
@@ -1,20 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
 	<File name="include/fft.h" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="3112" topLine="125" />
 		</Cursor>
 	</File>
 	<File name="include/matrix.h" open="0" top="0" tabpos="0" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
+<<<<<<< HEAD
 			<Cursor1 position="335" topLine="0" />
+=======
+<<<<<<< HEAD
+			<Cursor1 position="3059" topLine="88" />
+=======
+			<Cursor1 position="2939" topLine="79" />
+>>>>>>> 6067b589b58a8b47ec4fbf9237f3df9b74e08b81
+>>>>>>> f24ceedae968bd098a4d5ae986357090364572df
 		</Cursor>
+		<Folding>
+			<Collapse line="119" />
+		</Folding>
 	</File>
 	<File name="main.cpp" open="1" top="1" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
 			<Cursor1 position="1612" topLine="38" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>
diff --git a/HW3/compute_temperature.cc b/HW3/compute_temperature.cc
index fce0d52..1571e15 100644
--- a/HW3/compute_temperature.cc
+++ b/HW3/compute_temperature.cc
@@ -1,11 +1,39 @@
 #include "compute_temperature.hh"
 #include "fft.hh"
 #include "material_point.hh"
 #include <cmath>
+#include "my_types.hh"
 
 /* -------------------------------------------------------------------------- */
 
+// Constructor for initizalizing timestep
+ComputeTemperature::ComputeTemperature(Real dt) : dt(dt) {}
+
 void ComputeTemperature::compute(System& system) {
+
+// For the beginning, we need to read the number of particles
+UInt Sz = system.getNbParticles();
+
+// Matrix is filled with the material points, depending on the system size Sz
+
+Matrix<complex> tempMtx(sqrt(Sz));
+  	for (auto&& entry : index(tempMtx)) {
+  		int i = std::get<0>(entry);
+ 		int j = std::get<1>(entry);
+ 		auto& val = std::get<2>(entry);
+ 		Particle& par = system.getParticle(i*sqrt(Sz) + j);
+		auto& mp = static_cast<MaterialPoint&>(par);
+		val = mp.getTemperature();
+ 	}
+
+
+ 	// FFT transform, in order to solve the equation:
+ 	// https://www.math.ubc.ca/~feldman/m267/pdeft.pdf
+    Matrix<complex> tempMtx_fft = FFT::transform(tempMtx);
+
+    // Coordinates from FFT
+    Matrix<std::complex<int>> fft_coord = FFT::computeFrequencies(N);
+
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/HW3/compute_temperature.hh b/HW3/compute_temperature.hh
index 32f3492..0badc1b 100644
--- a/HW3/compute_temperature.hh
+++ b/HW3/compute_temperature.hh
@@ -1,18 +1,27 @@
 #ifndef __COMPUTE_TEMPERATURE__HH__
 #define __COMPUTE_TEMPERATURE__HH__
 
+
 /* -------------------------------------------------------------------------- */
 #include "compute.hh"
+#include "my_types.hh"
 
-//! Compute contact interaction between ping-pong balls
+//! Compute temperature
 class ComputeTemperature : public Compute {
 
   // Virtual implementation
 public:
   //! Penalty contact implementation
   void compute(System& system) override;
 
+// Adding variables
+public:
+  Real dt;
+/*!
+   \dt: The stable time step for the explicit solver.
+*/
+
 };
 
 /* -------------------------------------------------------------------------- */
 #endif  //__COMPUTE_TEMPERATURE__HH__