diff --git a/src/Bus.java b/src/Bus.java
index cab05c0..929c929 100644
--- a/src/Bus.java
+++ b/src/Bus.java
@@ -4,6 +4,7 @@ public class Bus extends CivilVehicle {
 	private String UID;
 	private static int numeberOfBuses;
     private final int TIME_TO_FIX = 20; //in minutes
+    public final int MAX_FORWARD = 900; //Meter/Min
 
     public static final double STD_BUS_SIZE = 10;
 
diff --git a/src/MakkahCity.java b/src/MakkahCity.java
index fbf296c..199669f 100644
--- a/src/MakkahCity.java
+++ b/src/MakkahCity.java
@@ -1,210 +1,216 @@
-import java.util.*;
-
-public class MakkahCity {
-
-	private static final ArrayList<Campaign> listOfCampaigns = new ArrayList<>();
-
-	private static final ArrayList<Vehicle> listOfVehicles = new ArrayList<>();
-	private static final Route[] stdRoutes = new Route[6];
-	private static final Street[] stdStreet = new Street[8];
-
-	private static final PDate timeManager = new PDate(
-		new GregorianCalendar(2020, Calendar.JANUARY, 1, 8, 0, 0),
-		new GregorianCalendar(2020, Calendar.JANUARY, 2, 8, 0, 0)
-	);
-
-	public static void main(String[] args) {
-
-		//Gen Camp
-		generateCamps(District.ALAZIZIYA, getRandom(70, 100));
-		generateCamps(District.ALMANSOOR, getRandom(110, 160));
-		generateCamps(District.ALHIJRA, getRandom(80, 110));
-
-		fillBusesToList();
-
-		//Make Streets
-		makeStreets();
-
-		//Make Routes
-		makeRoutes();
-
-		//Set Routes for Campaigns
-		setRoutesForCampaigns();
-
-		//TODO: [1]Set Schedule for Campaigns
-
-		while(!timeManager.isEnded()) {
-			timeManager.step(Calendar.MINUTE, 1);
-			System.out.println(timeManager.getCurrentTime());
-			//TODO: [2]add civil cars in loop iterations. (noise)
-			//noise based on time of day (From PDate)
-			//TODO: [3]Move busses and vehicles.
-
-			//TODO: [4]Update streets.
-
-			//TODO: [5]Streets move forward.
-
-			//TODO: [6]update vehicles on street.
-		}
-	}
-
-	private static void setRoutesForCampaigns() {
-		for (Campaign camp : listOfCampaigns){
-			camp.setDestToHousingRoute(getShortestRoute(camp));
-		}
-	}
-
-	/*
-	This is not used. The campaign object sets the routes for the busses
-	 */
-	@Deprecated
-	private static void setUpCampaginRoute(Campaign camp, int routeName) {
-		Route route = stdRoutes[routeName];
-		camp.setDestToHousingRoute(route);
-		//For now set all busses to one route
-		for(Vehicle vehicle : camp.getVehicles()){
-			vehicle.setRoute(route);
-		}
-	}
-
-	private static int getRandom(int min, int max) {
-		return (int)(Math.random() * (max - min) + min);
-	}
-
-	private static void generateCamps(District area, int count) {
-		for (int i = 0; i < count; i++){
-			Campaign camp = new Campaign(area, getRandom(10, 15));
-			listOfCampaigns.add(camp);
-		}
-	}
-
-	private static void makeStreets(){
-		stdStreet[StreetNames.KA_STREET.ordinal()] = new Street(22700,3);
-		stdStreet[StreetNames.FOURTH_HIGHWAY.ordinal()] = new Street(24600,4);
-		stdStreet[StreetNames.KUDAY.ordinal()] = new Street(22000,3);
-		stdStreet[StreetNames.STREET1.ordinal()] = new Street(4000,2);
-		stdStreet[StreetNames.STREET2.ordinal()] = new Street(7000,2);
-		stdStreet[StreetNames.STREET3.ordinal()] = new Street(400,2);
-		stdStreet[StreetNames.STREET4.ordinal()] = new Street(8200,2);
-		stdStreet[StreetNames.IBRAHIM_ALKHALIL.ordinal()] = new Street(100,2); //TODO: [7]Change numbers
-	}
-
-	private static void makeRoutes() {
-
-		stdRoutes[RouteName.mashierToAlHijra1.ordinal()] = new Route(
-				new Street[]{
-						stdStreet[StreetNames.STREET1.ordinal()],
-						stdStreet[StreetNames.STREET2.ordinal()],
-						stdStreet[StreetNames.KUDAY.ordinal()]},
-				District.ALHIJRA, Mashier.ARAFAT);
-
-		stdRoutes[RouteName.mashierToAlHijra2.ordinal()] = new Route(new Street[]{
-						stdStreet[StreetNames.STREET1.ordinal()],
-						stdStreet[StreetNames.FOURTH_HIGHWAY.ordinal()],
-						stdStreet[StreetNames.STREET4.ordinal()]
-		},District.ALHIJRA, Mashier.ARAFAT);
-
-		stdRoutes[RouteName.mashierToAlMansoor1.ordinal()] = new Route(
-				new Street[]{
-						stdStreet[StreetNames.STREET1.ordinal()],
-						stdStreet[StreetNames.STREET2.ordinal()],
-						stdStreet[StreetNames.KA_STREET.ordinal()],
-						stdStreet[StreetNames.STREET3.ordinal()]
-				},District.ALMANSOOR, Mashier.ARAFAT);
-
-		stdRoutes[RouteName.mashierToAlMansoor2.ordinal()] = new Route(
-				new Street[]{
-						stdStreet[StreetNames.STREET1.ordinal()],
-						stdStreet[StreetNames.STREET2.ordinal()],
-						stdStreet[StreetNames.KUDAY.ordinal()],
-						stdStreet[StreetNames.IBRAHIM_ALKHALIL.ordinal()]//TODO: [8]is actually half of ibrahim khalil.
-				},District.ALMANSOOR, Mashier.ARAFAT);
-
-		//Optimal for Almansoor
-		stdRoutes[RouteName.mashierToAlMansoor3.ordinal()] = new Route(
-				new Street[]{
-						stdStreet[StreetNames.STREET1.ordinal()],
-						stdStreet[StreetNames.FOURTH_HIGHWAY.ordinal()],
-						stdStreet[StreetNames.IBRAHIM_ALKHALIL.ordinal()]
-				},District.ALMANSOOR, Mashier.ARAFAT);
-
-		stdRoutes[RouteName.mashierToAlAzizi1.ordinal()] = new Route(
-				new Street[]{
-						stdStreet[StreetNames.STREET1.ordinal()],
-						stdStreet[StreetNames.STREET2.ordinal()],
-						stdStreet[StreetNames.KA_STREET.ordinal()]
-		},District.ALAZIZIYA, Mashier.ARAFAT);
-
-	}
-
-	private static void fillBusesToList() {
-		for (Campaign camp : listOfCampaigns) {
-			listOfVehicles.addAll(camp.getVehicles());
-		}
-	}
-
-	/**
-	 * Generates 'noise' cars to be used in streets
-	 * @param numberOfCars
-	 * @return Array of 70% Sedans and 30% SUVs
-	 */
-	private static CivilVehicle[] generateCivilVehicles(int numberOfCars) {
-
-		CivilVehicle[] cars = new CivilVehicle[numberOfCars];
-		int sedans = (int)(numberOfCars*0.7);
-		int SUVs = numberOfCars - sedans;
-
-		for (int i = 0; i < sedans; i++) {
-			cars[i] = new Sedan(getRandom(25,32)/10);
-		}
-
-		for (int i = 0; i < SUVs; i++) {
-			try {
-				cars[sedans+i] = new SUV(getRandom(35,45)/10);
-			}
-			catch (IndexOutOfBoundsException ex) {
-				break;
-			}
-		}
-		return cars;
-	}
-
-	public static PDate getTimeManager() {
-		return timeManager;
-	}
-
-	/**
-	 * Find shortest path without respect to traffic
-	 * @param campaign
-	 * @return
-	 */
-	private static Route getShortestRoute(Campaign campaign) {
-		Route[] routes = getRoutesToDistrict(campaign.getHotelDistrict());
-		Route route = null;
-		double min = Double.MAX_VALUE;
-		for (Route r : routes) {
-			if (r.getTotalLength() < min) {
-				min = r.getTotalLength();
-				route = r;
-			}
-		}
-		return route;
-	}
-
-	/**
-	 * Find routes that connect to a certain district.
-	 * @param district
-	 * @return Array of routes that connect to 'district'
-	 */
-	private static Route[] getRoutesToDistrict(District district) {
-		ArrayList<Route> routes = new ArrayList<>();
-		for (Route route : stdRoutes) {
-			if (route.getHotelArea() == district) {
-				routes.add(route);
-			}
-		}
-		Route[] routesArray = new Route[routes.size()];
-		return routes.toArray(routesArray);
-	}
-
-}
+import java.util.*;
+
+public class MakkahCity {
+
+	private static final ArrayList<Campaign> listOfCampaigns = new ArrayList<>();
+
+	private static final ArrayList<Vehicle> listOfVehicles = new ArrayList<>();
+	private static final Route[] stdRoutes = new Route[6];
+	private static final Street[] stdStreet = new Street[8];
+
+	private static final PDate timeManager = new PDate(
+		new GregorianCalendar(2020, Calendar.JANUARY, 1, 4, 0, 0),
+		new GregorianCalendar(2020, Calendar.JANUARY, 1, 20, 0, 0)
+	);
+
+	public static void main(String[] args) {
+
+		//Gen Camp
+		generateCamps(District.ALAZIZIYA, getRandom(70, 100));
+		generateCamps(District.ALMANSOOR, getRandom(110, 160));
+		generateCamps(District.ALHIJRA, getRandom(80, 110));
+
+		fillBusesToList();
+
+		//Make Streets
+		makeStreets();
+
+		//Make Routes
+		makeRoutes();
+
+		//Set Routes for Campaigns
+		setRoutesForCampaigns();
+
+
+
+		while(!timeManager.isEnded()) {
+			timeManager.step(Calendar.MINUTE, 1);
+			System.out.println(timeManager.getCurrentTime());
+			//TODO: [2]add civil cars in loop iterations. (noise)
+			//noise based on time of day (From PDate)
+			//TODO: [3]Move busses and vehicles.
+
+			//TODO: [4]Update streets.
+
+			//TODO: [5]Streets move forward.
+
+			for (Campaign campaign : listOfCampaigns){
+				for (Vehicle vehicle : campaign.getVehicles()){
+					vehicle.moveForward(((Bus)vehicle).MAX_FORWARD);
+				}
+			}
+
+			//TODO: [6]update vehicles on street.
+		}
+	}
+
+	private static void setRoutesForCampaigns() {
+		for (Campaign camp : listOfCampaigns){
+			camp.setDestToHousingRoute(getShortestRoute(camp));
+		}
+	}
+
+	/*
+	This is not used. The campaign object sets the routes for the busses
+	 */
+	@Deprecated
+	private static void setUpCampaginRoute(Campaign camp, int routeName) {
+		Route route = stdRoutes[routeName];
+		camp.setDestToHousingRoute(route);
+		//For now set all busses to one route
+		for(Vehicle vehicle : camp.getVehicles()){
+			vehicle.setRoute(route);
+		}
+	}
+
+	private static int getRandom(int min, int max) {
+		return (int)(Math.random() * (max - min) + min);
+	}
+
+	private static void generateCamps(District area, int count) {
+		for (int i = 0; i < count; i++){
+			Campaign camp = new Campaign(area, getRandom(10, 15));
+			listOfCampaigns.add(camp);
+		}
+	}
+
+	private static void makeStreets(){
+		stdStreet[StreetNames.KA_STREET.ordinal()] = new Street(22700,3, StreetNames.KA_STREET);
+		stdStreet[StreetNames.FOURTH_HIGHWAY.ordinal()] = new Street(24600,4, StreetNames.FOURTH_HIGHWAY);
+		stdStreet[StreetNames.KUDAY.ordinal()] = new Street(22000,3, StreetNames.KUDAY);
+		stdStreet[StreetNames.STREET1.ordinal()] = new Street(4000,2, StreetNames.STREET1);
+		stdStreet[StreetNames.STREET2.ordinal()] = new Street(7000,2,StreetNames.STREET2);
+		stdStreet[StreetNames.STREET3.ordinal()] = new Street(400,2, StreetNames.STREET3);
+		stdStreet[StreetNames.STREET4.ordinal()] = new Street(8200,2,StreetNames.STREET4);
+		stdStreet[StreetNames.IBRAHIM_ALKHALIL.ordinal()] = new Street(100,2, StreetNames.IBRAHIM_ALKHALIL); //TODO: [7]Change numbers
+	}
+
+	private static void makeRoutes() {
+
+		stdRoutes[RouteName.mashierToAlHijra1.ordinal()] = new Route(
+				new Street[]{
+						stdStreet[StreetNames.STREET1.ordinal()],
+						stdStreet[StreetNames.STREET2.ordinal()],
+						stdStreet[StreetNames.KUDAY.ordinal()]},
+				District.ALHIJRA, Mashier.ARAFAT);
+
+		stdRoutes[RouteName.mashierToAlHijra2.ordinal()] = new Route(new Street[]{
+						stdStreet[StreetNames.STREET1.ordinal()],
+						stdStreet[StreetNames.FOURTH_HIGHWAY.ordinal()],
+						stdStreet[StreetNames.STREET4.ordinal()]
+		},District.ALHIJRA, Mashier.ARAFAT);
+
+		stdRoutes[RouteName.mashierToAlMansoor1.ordinal()] = new Route(
+				new Street[]{
+						stdStreet[StreetNames.STREET1.ordinal()],
+						stdStreet[StreetNames.STREET2.ordinal()],
+						stdStreet[StreetNames.KA_STREET.ordinal()],
+						stdStreet[StreetNames.STREET3.ordinal()]
+				},District.ALMANSOOR, Mashier.ARAFAT);
+
+		stdRoutes[RouteName.mashierToAlMansoor2.ordinal()] = new Route(
+				new Street[]{
+						stdStreet[StreetNames.STREET1.ordinal()],
+						stdStreet[StreetNames.STREET2.ordinal()],
+						stdStreet[StreetNames.KUDAY.ordinal()],
+						stdStreet[StreetNames.IBRAHIM_ALKHALIL.ordinal()]//TODO: [8]is actually half of ibrahim khalil.
+				},District.ALMANSOOR, Mashier.ARAFAT);
+
+		//Optimal for Almansoor
+		stdRoutes[RouteName.mashierToAlMansoor3.ordinal()] = new Route(
+				new Street[]{
+						stdStreet[StreetNames.STREET1.ordinal()],
+						stdStreet[StreetNames.FOURTH_HIGHWAY.ordinal()],
+						stdStreet[StreetNames.IBRAHIM_ALKHALIL.ordinal()]
+				},District.ALMANSOOR, Mashier.ARAFAT);
+
+		stdRoutes[RouteName.mashierToAlAzizi1.ordinal()] = new Route(
+				new Street[]{
+						stdStreet[StreetNames.STREET1.ordinal()],
+						stdStreet[StreetNames.STREET2.ordinal()],
+						stdStreet[StreetNames.KA_STREET.ordinal()]
+		},District.ALAZIZIYA, Mashier.ARAFAT);
+
+	}
+
+	private static void fillBusesToList() {
+		for (Campaign camp : listOfCampaigns) {
+			listOfVehicles.addAll(camp.getVehicles());
+		}
+	}
+
+	/**
+	 * Generates 'noise' cars to be used in streets
+	 * @param numberOfCars
+	 * @return Array of 70% Sedans and 30% SUVs
+	 */
+	private static CivilVehicle[] generateCivilVehicles(int numberOfCars) {
+
+		CivilVehicle[] cars = new CivilVehicle[numberOfCars];
+		int sedans = (int)(numberOfCars*0.7);
+		int SUVs = numberOfCars - sedans;
+
+		for (int i = 0; i < sedans; i++) {
+			cars[i] = new Sedan(getRandom(25,32)/10);
+		}
+
+		for (int i = 0; i < SUVs; i++) {
+			try {
+				cars[sedans+i] = new SUV(getRandom(35,45)/10);
+			}
+			catch (IndexOutOfBoundsException ex) {
+				break;
+			}
+		}
+		return cars;
+	}
+
+	public static PDate getTimeManager() {
+		return timeManager;
+	}
+
+	/**
+	 * Find shortest path without respect to traffic
+	 * @param campaign
+	 * @return
+	 */
+	private static Route getShortestRoute(Campaign campaign) {
+		Route[] routes = getRoutesToDistrict(campaign.getHotelDistrict());
+		Route route = null;
+		double min = Double.MAX_VALUE;
+		for (Route r : routes) {
+			if (r.getTotalLength() < min) {
+				min = r.getTotalLength();
+				route = r;
+			}
+		}
+		return route;
+	}
+
+	/**
+	 * Find routes that connect to a certain district.
+	 * @param district
+	 * @return Array of routes that connect to 'district'
+	 */
+	private static Route[] getRoutesToDistrict(District district) {
+		ArrayList<Route> routes = new ArrayList<>();
+		for (Route route : stdRoutes) {
+			if (route.getHotelArea() == district) {
+				routes.add(route);
+			}
+		}
+		Route[] routesArray = new Route[routes.size()];
+		return routes.toArray(routesArray);
+	}
+
+}
diff --git a/src/SUV.java b/src/SUV.java
index 386288a..4bd690d 100644
--- a/src/SUV.java
+++ b/src/SUV.java
@@ -2,6 +2,7 @@
 public class SUV extends CivilVehicle {
 
     private final int TIME_TO_FIX = 15; //in minutes
+    public final int MAX_FORWARD = 1300;
 
     public SUV(double vehicleSize){
         super(vehicleSize);
diff --git a/src/Sedan.java b/src/Sedan.java
index 0a17c7a..e6ee0ac 100644
--- a/src/Sedan.java
+++ b/src/Sedan.java
@@ -2,6 +2,7 @@
 public class Sedan extends CivilVehicle {
 
     private final int TIME_TO_FIX = 15; //in minutes
+    public final int MAX_FORWARD = 1500; // Meter/Min
 
     public Sedan(double vehicleSize){
         super(vehicleSize);
diff --git a/src/Street.java b/src/Street.java
index e992473..a482972 100644
--- a/src/Street.java
+++ b/src/Street.java
@@ -5,12 +5,14 @@ public class Street {
     private double length;
     private int numberOfLanes;
     private ArrayList<Vehicle> vehicles;
+    private StreetNames name;
   
 
-    public Street(double length, int numberOfLanes) {
+    public Street(double length, int numberOfLanes, StreetNames name) {
         vehicles = new ArrayList<>();
         setLength(length);
         setNumberOfLanes(numberOfLanes);
+        this.name = name;
     }
 
     private void setLength(double length) {
@@ -44,6 +46,10 @@ public class Street {
         return vehicles;
     }
 
+    public StreetNames getName() {
+        return name;
+    }
+
     public double capcity() {
         double totalLength =  length * numberOfLanes;
         double totalLenthofCar=0;
@@ -70,5 +76,4 @@ public class Street {
             vehicles.add(vehicle);
         }
     }
-  
 }
diff --git a/src/Vehicle.java b/src/Vehicle.java
index df6aa0f..3e69ad4 100644
--- a/src/Vehicle.java
+++ b/src/Vehicle.java
@@ -25,6 +25,7 @@ public abstract class Vehicle {
     public void setRoute(Route route) {
         this.route = route;
         this.currentStreetIndex = 0;
+        this.currentStreet = route.getStreets()[0];
         this.route.getStreets()[0].addVehicle(this);//TODO: [9]street might not add if capacity is low
     }
 
@@ -42,12 +43,22 @@ public abstract class Vehicle {
     }
 
     public void moveForward(double distance) {
-        if (moving && !arrivedToDest){
+        if (!moving && !arrivedToDest) moving = true;
+        if (!arrivedToDest){
             if (isAtEndOfCurrentStreet()) {
                 moveToNextStreet();
                 //this.currentLocation += distance;
             }
-            else this.currentLocation += distance;
+            else {
+                double dToNext = getDistanceToNextVehicle();
+                double trafficFactor = getCurrentStreet().getPercentRemainingCapacity() / 100.0;
+                if (dToNext == -1 ) {
+                    this.currentLocation += distance * trafficFactor;
+                } else if (dToNext < distance){//TODO after I wake up
+                     this.currentLocation += distance;
+                }
+
+            }
         }
     }
 
@@ -60,7 +71,7 @@ public abstract class Vehicle {
         this.currentStreetIndex++;
         Street nextStreet;
         try { nextStreet = this.getRoute().getStreets()[currentStreetIndex]; }
-        catch (IndexOutOfBoundsException e) { this.arrivedToDest = true; return;}
+        catch (IndexOutOfBoundsException e) { this.arrivedToDest = true; this.moving = false; return;}
         if (nextStreet.canTakeVehicles(this)){
             this.currentStreet = nextStreet;
             this.currentLocation = 0;