diff --git a/BasicConsumer/.gitignore b/BasicConsumer/.gitignore
index 9f1c89a..ab0a247 100644
--- a/BasicConsumer/.gitignore
+++ b/BasicConsumer/.gitignore
@@ -3,3 +3,4 @@
 .classpath
 .project
 BasicConsumer.iml
+.DS_Store
\ No newline at end of file
diff --git a/BasicConsumer/src/eu/arrowhead/BasicConsumer/BasicConsumerMain.java b/BasicConsumer/src/eu/arrowhead/BasicConsumer/BasicConsumerMain.java
index 1c1c3aa..a31b6df 100644
--- a/BasicConsumer/src/eu/arrowhead/BasicConsumer/BasicConsumerMain.java
+++ b/BasicConsumer/src/eu/arrowhead/BasicConsumer/BasicConsumerMain.java
@@ -9,20 +9,20 @@
 
 package eu.arrowhead.BasicConsumer;
 
-import com.google.gson.Gson;
+import com.google.gson.Gson; //A Java serialization/deserialization library to convert Java Objects into JSON and back
 import eu.arrowhead.BasicConsumer.model.ArrowheadSystem;
 import eu.arrowhead.BasicConsumer.model.OrchestrationResponse;
 import eu.arrowhead.BasicConsumer.model.TemperatureReadout;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
+import java.io.BufferedReader;  // Reads text from a character-input stream, buffering characters so as to provide for the efficient reading of characters, arrays, and lines.
+import java.io.File;  // An abstract representation of file and directory pathnames.
+import java.io.FileInputStream; // contains some other input stream, which it uses as its basic source of data, possibly transforming the data along the way or providing additional functionality.
+import java.io.InputStreamReader; // An InputStreamReader is a bridge from byte streams to character streams: It reads bytes and decodes them into characters using a specified charset.
+import java.io.OutputStreamWriter;  // This class is the superclass of all classes that filter output streams.
+import java.net.HttpURLConnection;  //A URLConnection with support for HTTP-specific features.
+import java.net.URL;  // Class URL represents a Uniform Resource Locator, a pointer to a "resource" on the World Wide Web.
+import java.util.ArrayList; // Resizable-array implementation of the List interface.
+import java.util.List;  // An ordered collection (also known as a sequence). (Interface rather than a class)
+import java.util.Properties;  // The Properties class represents a persistent set of properties.
 import org.json.JSONException;
 import org.json.JSONObject;
 
diff --git a/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/ArrowheadService.java b/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/ArrowheadService.java
index a778cfd..a2c1f4a 100644
--- a/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/ArrowheadService.java
+++ b/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/ArrowheadService.java
@@ -9,10 +9,10 @@
 
 package eu.arrowhead.BasicConsumer.model;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.ArrayList; // Resizable-array implementation of the List interface.
+import java.util.HashMap; //Hash table based implementation of the Map interface.
+import java.util.List;  // An ordered collection (also known as a sequence). (Interface rather than a class)
+import java.util.Map; // An object that maps keys to values. (Interface rather than class)
 
 public class ArrowheadService {
 
diff --git a/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/MeasurementEntry.java b/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/MeasurementEntry.java
index 3983d80..6143197 100644
--- a/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/MeasurementEntry.java
+++ b/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/MeasurementEntry.java
@@ -9,7 +9,7 @@
 
 package eu.arrowhead.BasicConsumer.model;
 
-//SenML format - expected response from the Provider client
+//SenML format - expected response from the Provider client (Is a provieder client the Consumer?)
 public class MeasurementEntry {
 
   private String n;
diff --git a/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/OrchestrationResponse.java b/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/OrchestrationResponse.java
index 4b375af..df616b1 100644
--- a/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/OrchestrationResponse.java
+++ b/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/OrchestrationResponse.java
@@ -9,8 +9,8 @@
 
 package eu.arrowhead.BasicConsumer.model;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList; // An ordered collection (also known as a sequence). (Interface rather than a class)
+import java.util.List;  // The Properties class represents a persistent set of properties.
 
 public class OrchestrationResponse {
 
diff --git a/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/TemperatureReadout.java b/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/TemperatureReadout.java
index d2e176e..2726a5b 100644
--- a/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/TemperatureReadout.java
+++ b/BasicConsumer/src/eu/arrowhead/BasicConsumer/model/TemperatureReadout.java
@@ -9,8 +9,8 @@
 
 package eu.arrowhead.BasicConsumer.model;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.ArrayList;// An ordered collection (also known as a sequence). (Interface rather than a class)
+import java.util.List;  // The Properties class represents a persistent set of properties.
 
 //SenML format - expected response from the Provider client
 public class TemperatureReadout {