diff --git a/.gitignore b/.gitignore
index 1c2ba5fe..d8912c9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ out
 .idea/
 *.iml
 
+*.log
diff --git a/src/main/java/de/tum/bgu/msm/modules/trafficAssignment/TripCSVToMATSimPlan.java b/src/main/java/de/tum/bgu/msm/modules/trafficAssignment/TripCSVToMATSimPlan.java
index afe0e429..669e5dfe 100644
--- a/src/main/java/de/tum/bgu/msm/modules/trafficAssignment/TripCSVToMATSimPlan.java
+++ b/src/main/java/de/tum/bgu/msm/modules/trafficAssignment/TripCSVToMATSimPlan.java
@@ -1,14 +1,188 @@
 package de.tum.bgu.msm.modules.trafficAssignment;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.matsim.api.core.v01.Coord;
+import org.matsim.api.core.v01.Id;
+import org.matsim.api.core.v01.Scenario;
+import org.matsim.api.core.v01.network.Network;
+import org.matsim.api.core.v01.population.Activity;
+import org.matsim.api.core.v01.population.Leg;
+import org.matsim.api.core.v01.population.Person;
+import org.matsim.api.core.v01.population.Plan;
+import org.matsim.api.core.v01.population.Population;
+import org.matsim.api.core.v01.population.PopulationFactory;
+import org.matsim.api.core.v01.population.PopulationWriter;
+import org.matsim.core.config.Config;
+import org.matsim.core.config.ConfigUtils;
+import org.matsim.core.network.NetworkUtils;
+import org.matsim.core.network.algorithms.TransportModeNetworkFilter;
+import org.matsim.core.population.PopulationUtils;
+import org.matsim.core.scenario.ScenarioUtils;
+
+import de.tum.bgu.msm.data.Purpose;
+
 public class TripCSVToMATSimPlan {
 
-    //This class will read trip lists in CSV from MITO and creates a MATSim XML plan file
+	// This class will read trip lists in CSV from MITO and creates a MATSim XML
+	// plan file
+	private static String delimiter = ",";
+
+	private static String filename;
+	private static PopulationFactory factory;
+	private static Network carNetwork;
+
+	public static void main(String[] args) {
+		// TODO add logging
+		filename = args[0];
+		String networkFile = args[1];
+
+		Config config = ConfigUtils.createConfig();
+		config.network().setInputFile(networkFile);
+
+		Scenario scenario = ScenarioUtils.loadScenario(config);
+		TransportModeNetworkFilter filter = new TransportModeNetworkFilter(scenario.getNetwork());
+		Set<String> modesCar = new HashSet<>();
+		modesCar.add("car");
+		carNetwork = NetworkUtils.createNetwork();
+		filter.filter(carNetwork, modesCar);
+
+		Population population = PopulationUtils.createPopulation(config);
+		factory = population.getFactory();
+
+		try {
+			FileReader in = null;
+			BufferedReader br = null;
+			try {
+				in = new FileReader(filename);
+				br = new BufferedReader(in);
+
+				String line;
+				int i = 0;
+				br.readLine(); // skip CSV header
+				while ((line = br.readLine()) != null) {
+					Person p = createPersonFromTrip(i++, line);
+					if (p != null)
+						population.addPerson(p);
+				}
+			} finally {
+				if (br != null)
+					br.close();
+
+				if (in != null)
+					in.close();
+			}
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		PopulationWriter popwriter = new PopulationWriter(population);
+		popwriter.write(filename + ".xml.gz");
+
+		System.out.println("done.");
+	}
+
+	private static Person createPersonFromTrip(int i, String line) {
+		Trip t = new Trip(line);
+		
+		String mode = decodeMode(t.mode);
+		Id<Person> matsimId = Id.createPersonId(t.person + "_" + i);
+
+		Person p = factory.createPerson(Id.createPersonId(matsimId));
+		Plan plan = factory.createPlan();
+
+		Purpose purpose = Purpose.valueOf(t.purpose);
+		boolean roundTrip = !(purpose.equals(Purpose.NHBW) || purpose.equals(Purpose.NHBO));
+
+		String firstActivityType = MatsimPopulationGenerator.getOriginActivity(purpose);
+		Coord firstCoord = new Coord(t.originX, t.originY);
+
+		Activity firstAct = factory.createActivityFromCoord(firstActivityType, firstCoord);
+		firstAct.setLinkId(NetworkUtils.getNearestLink(carNetwork, firstCoord).getId());
+
+		firstAct.setEndTime(t.departure_time);
+		plan.addActivity(firstAct);
+		
+		Leg firstLeg = factory.createLeg(mode);
+		firstLeg.setDepartureTime(t.departure_time);
+		plan.addLeg(firstLeg);
+
+		String secondActivityType = MatsimPopulationGenerator.getDestinationActivity(purpose);
+		Coord secondCoord = new Coord(t.destinationX, t.destinationY);
+
+		Activity secondAct = factory.createActivityFromCoord(secondActivityType, secondCoord);
+		secondAct.setLinkId(NetworkUtils.getNearestLink(carNetwork, secondCoord).getId());
+		secondAct.setStartTime(t.departure_time + 1); // TODO include MITO's travel time estimations
+
+		if (roundTrip)
+			secondAct.setEndTime(t.departure_time_return);
+		plan.addActivity(secondAct);
+
+		if (roundTrip) {
+			Leg secondLeg = factory.createLeg(mode);
+			secondLeg.setDepartureTime(t.departure_time_return);
+			plan.addLeg(secondLeg);
 
-    public static void main(String[] args){
+			Activity thirdAct = factory.createActivityFromCoord(firstActivityType, firstCoord);
+			thirdAct.setLinkId(NetworkUtils.getNearestLink(carNetwork, firstCoord).getId());
+			thirdAct.setStartTime(t.departure_time_return + 1); // TODO include MITO's travel time estimations
+			plan.addActivity(thirdAct);
+		}
 
+		p.addPlan(plan);
+		p.setSelectedPlan(plan);
+		return p;
+	}
 
+	private static String decodeMode(String encodedMode) {
+		switch (encodedMode) {
+		case "autoDriver":
+			return "car";
+		case "autoPassenger":
+			return "car_passenger";
+		case "train":
+		case "bus":
+		case "tramOrMetro":
+			return "pt";
+		case "bicycle":
+			return "bike";
+		default:
+			return encodedMode;
+		}
+	}
 
+	public final static class Trip {
+		public final double originX;
+		public final double originY;
+		public final double destinationX;
+		public final double destinationY;
+		public final String purpose;
+		public final String person;
+		public final double distance;
+		public final String mode;
+		public final double departure_time;
+		public final double departure_time_return;
 
+		public Trip(String line) {
+			String[] data = line.split(delimiter);
+			this.originX = Double.parseDouble(data[2]);
+			this.originY = Double.parseDouble(data[3]);
+			this.destinationX = Double.parseDouble(data[4]);
+			this.destinationY = Double.parseDouble(data[5]);
+			this.purpose = data[7];
+			this.person = data[8];
+			this.distance = Double.parseDouble(data[9]);
+			this.mode = data[14];
+			this.departure_time = Double.parseDouble(data[15]);
 
-    }
+			if (data.length >= 17)
+				this.departure_time_return = Double.parseDouble(data[16]);
+			else
+				this.departure_time_return = -1;
+		}
+	}
 }