diff --git a/src/de/c3seidenstrasse/networkcontroller/communication/SssMessageProcessor.java b/src/de/c3seidenstrasse/networkcontroller/communication/SssMessageProcessor.java
index c10880c..471dec0 100644
--- a/src/de/c3seidenstrasse/networkcontroller/communication/SssMessageProcessor.java
+++ b/src/de/c3seidenstrasse/networkcontroller/communication/SssMessageProcessor.java
@@ -2,8 +2,10 @@
 
 import de.c3seidenstrasse.networkcontroller.network.AirSupplier;
 import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
+import de.c3seidenstrasse.networkcontroller.route.Message;
 import de.c3seidenstrasse.networkcontroller.route.Network;
 import de.c3seidenstrasse.networkcontroller.route.Transport;
+import de.c3seidenstrasse.networkcontroller.route.Message.MessageType;
 import de.c3seidenstrasse.networkcontroller.utils.RouteNotFoundException;
 import javafx.application.Platform;
 
@@ -18,62 +20,55 @@ public class SssMessageProcessor implements Runnable {
 
 	@Override
 	public void run() {
-		System.out.println("MSG: " + this.message[0]);
-		System.out.println("SRC: " + this.message[1]);
-		System.out.println("DST: " + this.message[2]);
-		System.out.println("PL1: " + this.message[3]);
+		Message messageObject = new Message(this.message, true);
 		Platform.runLater(() -> {
-			this.n.saveBusToList(this.message, true);
+			System.out.println(messageObject);
+			this.n.saveBusToList(messageObject);
 		});
 		if (this.message[1] == AirSupplier.CHANGER_ID) {
 			// delegate message to AirSupplier
 			this.n.getAirsupplier().messageRecieved(this.message[0], this.message[1], this.message[3]);
 			return;
 		}
-		switch (this.message[0]) {
-		case 0x00:
-			// Kapsel erkannt
+
+		switch (messageObject.getType()) {
+		case DETECT:
 			final NetworkComponent nc = this.n.getNodeById((int) this.message[1]);
 			nc.capsulePassed();
 			break;
-		case 0x01:
-			// Verbindung herstellen
+		case CONNECT:
 			// verwerfen
 			break;
-		case 0x02:
-			// Verbindung wurde hergestellt
+		case CONNECTED:
+			// 
 			final NetworkComponent nc1 = this.n.getNodeById((int) this.message[1]);
 			nc1.setCurrentExit((int) this.message[3]);
 			break;
-		case 0x03:
-			// Anforderung direkter Transfer
+		case REQUEST:
+			// 
 			final NetworkComponent src = this.n.getNodeById((int) this.message[1]);
 			final NetworkComponent dst = this.n.getNodeById((int) this.message[3]);
 			try {
 				final Transport t = new Transport(src, dst);
 				this.n.addTransport(t);
-				final byte[] message = { 0x05, 0x00, this.message[1], this.message[3], 0x00, 0x00, 0x00, 0x00, 0x00,
-						0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-				this.n.send(message);
+				// FIXME not sure if the start should go into byte 1 or 2, so I put it into both bytes.
+				this.n.send(new Message(MessageType.ACK_ROUTE, this.message[1], this.message[1], this.message[3]));
+
 			} catch (final RouteNotFoundException e) {
 				// forget it
 				e.printStackTrace();
 			}
 			break;
-		case 0x04:
-			// Anforderung Barcode Transfer
+		case DUMMY_4:
 			// TODO implement barcode transfer
 			break;
-		case 0x05:
-			// Best�tigung Transfer
+		case ACK_ROUTE:
 			// verwerfen
 			break;
-		case 0x06:
-			// Transfer Start
+		case STARTED:
 			// verwerfen
 			break;
-		case 0x07:
-			// Barcode gelesen
+		case BARCODE:
 			// TODO implement barcode transfer
 			break;
 		}
diff --git a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml
index abfa260..b62e169 100644
--- a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml
+++ b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.layout.FlowPane?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="750.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.c3seidenstrasse.networkcontroller.gui.NetworkScreenController">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="768.0" prefWidth="1024.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.c3seidenstrasse.networkcontroller.gui.NetworkScreenController">
    <left>
       <TreeView fx:id="ncTree" prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
    </left>
@@ -22,23 +22,23 @@
                      <children>
                         <Button mnemonicParsing="false" onAction="#turnToAction" text="Send" />
                         <Button mnemonicParsing="false" onAction="#homeAction" text="Home" />
+                        <Button mnemonicParsing="false" onAction="#connectedAction" text="Simulate connected" />
                      </children>
                   </HBox>
                </children>
             </VBox>
             <VBox alignment="TOP_CENTER" prefHeight="300.0" prefWidth="400.0" spacing="5.0">
                <children>
-                  <Label text="Transport" />
+                  <Label text="Interconnect" />
                   <HBox spacing="5.0">
                      <children>
-                        <ComboBox fx:id="fromDropdown" prefWidth="200.0" />
-                        <ComboBox fx:id="toDropdown" prefWidth="200.0" />
+                        <ComboBox fx:id="fromDropdown" prefWidth="200.0" promptText="from" />
+                        <ComboBox fx:id="toDropdown" prefWidth="200.0" promptText="to" />
                      </children>
                   </HBox>
                   <HBox alignment="TOP_CENTER" prefHeight="100.0" prefWidth="200.0" spacing="5.0">
                      <children>
                         <Button fx:id="addTransportButton" mnemonicParsing="false" onAction="#addRouteAction" text="Add" />
-                        <Button mnemonicParsing="false" onAction="#passedAction" text="Passed!" />
                      </children>
                   </HBox>
                </children>
@@ -56,7 +56,7 @@
          </BorderPane.margin></HBox>
    </bottom>
    <center>
-      <ImageView fitHeight="400.0" fitWidth="400.0" pickOnBounds="true" preserveRatio="true" BorderPane.alignment="CENTER">
+      <ImageView fitHeight="600.0" fitWidth="600.0" pickOnBounds="true" preserveRatio="true" BorderPane.alignment="CENTER">
          <image>
             <Image url="@../utils/networkmap.png" />
          </image>
@@ -69,7 +69,7 @@
       <VBox fx:id="rightVbox" prefHeight="200.0" BorderPane.alignment="CENTER">
          <children>
             <ListView fx:id="messageLog" prefHeight="500.0" />
-            <ListView fx:id="transportLog" prefHeight="200.0" prefWidth="200.0" />
+            <ListView fx:id="connectLog" prefHeight="200.0" prefWidth="200.0" />
          </children>
       </VBox>
    </right>
diff --git a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.java b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.java
index 26a49fb..0402264 100644
--- a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.java
+++ b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreen.java
@@ -24,7 +24,7 @@ public void start(final Stage primaryStage) throws Exception {
 			final Scene scene = new Scene(page);
 			primaryStage.setScene(scene);
 			primaryStage.setTitle("Network Display");
-			primaryStage.setFullScreen(true);
+			//primaryStage.setFullScreen(true);
 			// primaryStage.setResizable(false);
 			final NetworkScreenController c = loader.getController();
 			final Network n = c.init();
diff --git a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreenController.java b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreenController.java
index 62a098a..dbcdce9 100644
--- a/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreenController.java
+++ b/src/de/c3seidenstrasse/networkcontroller/gui/NetworkScreenController.java
@@ -4,20 +4,25 @@
 import java.util.Map.Entry;
 
 import de.c3seidenstrasse.networkcontroller.network.Exit;
-import de.c3seidenstrasse.networkcontroller.network.IndexedNetworkComponent;
 import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
+import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
+import de.c3seidenstrasse.networkcontroller.network.Router;
+import de.c3seidenstrasse.networkcontroller.route.Interconnect;
+import de.c3seidenstrasse.networkcontroller.route.Message;
 import de.c3seidenstrasse.networkcontroller.route.Network;
 import de.c3seidenstrasse.networkcontroller.route.Transport;
+import de.c3seidenstrasse.networkcontroller.utils.NoCurrentTransportException;
 import de.c3seidenstrasse.networkcontroller.utils.RouteNotFoundException;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
+import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Alert.AlertType;
-import javafx.scene.control.ComboBox;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
 import javafx.scene.layout.VBox;
@@ -28,19 +33,19 @@ public class NetworkScreenController {
 	public TreeView<NetworkComponent> ncTree;
 	public NetworkComponent selected;
 	@FXML
-	ComboBox<IndexedNetworkComponent> childCombobox;
+	ComboBox<NetworkComponent> childCombobox;
 	@FXML
-	ComboBox<Exit> fromDropdown;
+	ComboBox<NetworkComponent> fromDropdown;
 	@FXML
-	ComboBox<Exit> toDropdown;
+	ComboBox<NetworkComponent> toDropdown;
 	@FXML
 	Button addTransportButton;
 	@FXML
-	ListView<Network.Message> messageLog;
+	ListView<Message> messageLog;
 	@FXML
 	VBox rightVbox;
 	@FXML
-	ListView<Transport> transportLog;
+	ListView<Interconnect> connectLog;
 
 	public Network init() {
 		this.n = Network.create();
@@ -48,9 +53,12 @@ public Network init() {
 		// Message Queue
 		this.messageLog.setItems(this.n.getBusProtocolHistory());
 		this.messageLog.prefHeightProperty().bind(this.rightVbox.heightProperty().divide(2));
+		this.n.getBusProtocolHistory().addListener((ListChangeListener<Message>) c -> {
+			this.messageLog.scrollTo(this.n.getBusProtocolHistory().size());
+		});
 
-		// Transport Queue
-		this.transportLog.prefHeightProperty().bind(this.rightVbox.heightProperty().divide(2));
+		// Connect Queue
+		this.connectLog.prefHeightProperty().bind(this.rightVbox.heightProperty().divide(2));
 
 		// Netzwerkliste
 		this.selected = this.n.getRoot();
@@ -61,13 +69,22 @@ public Network init() {
 		});
 
 		// fill dropdowns
-		final ObservableList<Exit> exits = FXCollections.observableArrayList();
+		final ObservableList<NetworkComponent> exits = FXCollections.observableArrayList();
 		final Iterator<Entry<Integer, NetworkComponent>> i = this.n.getIdMap().entrySet().iterator();
 		while (i.hasNext()) {
 			final NetworkComponent current = i.next().getValue();
-			if (current instanceof Exit)
-				exits.add((Exit) current);
+			if (current instanceof Exit || current instanceof Router)
+				exits.add(current);
 		}
+		exits.sort((arg0, arg1) -> {
+			if (arg0 instanceof Router && arg1 instanceof Exit) {
+				return -1;
+			} else if (arg1 instanceof Router && arg0 instanceof Exit) {
+				return 1;
+			}
+			return arg0.getName().compareTo(arg1.getName());
+		});
+
 		this.fromDropdown.setItems(exits);
 		this.toDropdown.setItems(exits);
 
@@ -77,11 +94,11 @@ public Network init() {
 	private void selected(final NetworkComponent nc) {
 		this.selected = nc;
 		this.childCombobox.getItems().clear();
-		this.childCombobox.getItems().addAll(this.selected.getIndexedChildren());
+		this.childCombobox.getItems().addAll(this.selected.getIndexedChildren().values());
 		this.childCombobox.getItems().sort((arg0, arg1) -> {
-			if (arg0.getI() < arg1.getI())
+			if (arg0.getIndexInParent() < arg1.getIndexInParent())
 				return -1;
-			else if (arg0.getI() > arg1.getI())
+			else if (arg0.getIndexInParent() > arg1.getIndexInParent())
 				return 1;
 			return 0;
 		});
@@ -89,34 +106,44 @@ else if (arg0.getI() > arg1.getI())
 	}
 
 	public void turnToAction() {
-		final IndexedNetworkComponent inc = this.childCombobox.getValue();
-		this.selected.turnTo(inc.getI());
+		final NetworkComponent inc = this.childCombobox.getValue();
+		this.selected.turnTo(inc.getIndexInParent());
+	}
+	
+	public void connectedAction() {
+		final NetworkComponent inc = this.childCombobox.getValue();
+		selected.setCurrentExit(inc.getIndexInParent());
 	}
 
 	@FXML
 	public void addRouteAction() {
-		final Exit start = this.fromDropdown.getValue();
-		final Exit ende = this.toDropdown.getValue();
-		if (start == null || ende == null)
-			return;
-		try {
-			final Transport t = new Transport(this.fromDropdown.getValue(), this.toDropdown.getValue());
-			this.n.addTransport(t);
-			this.addTransportButton.setStyle("-fx-base: #b6e7c9;");
-			Platform.runLater(() -> {
-				try {
-					Thread.sleep(1000);
-				} catch (final InterruptedException e) {
-				}
-				NetworkScreenController.this.addTransportButton.setStyle("");
-			});
-		} catch (final RouteNotFoundException e) {
-			final Alert alert = new Alert(AlertType.ERROR);
-			alert.setTitle("Route not found");
-			alert.setHeaderText("works not for you");
-			alert.setContentText("I was not able to find a route between your selected targets!");
-			alert.show();
-		}
+		final NetworkComponent start = this.fromDropdown.getValue();
+		final NetworkComponent ende = this.toDropdown.getValue();
+		Platform.runLater(() -> {
+			Transport t;
+			try {
+				t = new Transport(start, ende);
+				this.n.addTransport(t);
+				System.out.println("Added transport: " + t);
+			} catch (RouteNotFoundException e) {
+				e.printStackTrace();
+			}
+			
+			/*
+			try {
+				//final Interconnect ic = new Interconnect(start, ende, this.connectLog.getItems());
+				//ic.setUpRoute();
+				this.connectLog.getItems().add(ic);
+			} catch (RouteNotFoundException | NoCurrentTransportException e) {
+				final Alert alert = new Alert(AlertType.ERROR);
+				alert.setTitle("Error");
+				alert.setHeaderText("Error in executing Interconnect");
+				alert.setContentText(e.getMessage());
+
+				alert.show();
+			}
+			*/
+		});
 	}
 
 	@FXML
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/AirSupplier.java b/src/de/c3seidenstrasse/networkcontroller/network/AirSupplier.java
index 2e686e7..5230034 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/AirSupplier.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/AirSupplier.java
@@ -1,6 +1,8 @@
 package de.c3seidenstrasse.networkcontroller.network;
 
+import de.c3seidenstrasse.networkcontroller.route.Message;
 import de.c3seidenstrasse.networkcontroller.route.Network;
+import de.c3seidenstrasse.networkcontroller.route.Message.MessageType;
 
 public class AirSupplier {
 	public final static byte CHANGER_ID = (byte) 0xFF;
@@ -37,15 +39,11 @@ synchronized public void preparePushFinished() {
 	}
 
 	synchronized private void turnForPull() {
-		final byte[] message = { 0x08, 0x00, CHANGER_ID, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00 };
-		this.n.send(message);
+		this.n.send(new Message(MessageType.AIRFLOW, 0, CHANGER_ID, 1));
 	}
 
 	synchronized private void turnForPush() {
-		final byte[] message = { 0x08, 0x00, CHANGER_ID, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00 };
-		this.n.send(message);
+		this.n.send(new Message(MessageType.AIRFLOW, 0, CHANGER_ID, 2));
 	}
 
 	synchronized public void pull() {
@@ -59,9 +57,7 @@ synchronized public void push() {
 	}
 
 	synchronized public void stop() {
-		final byte[] message = { 0x08, 0x00, CHANGER_ID, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00 };
-		this.n.send(message);
+		this.n.send(new Message(MessageType.AIRFLOW, 0, CHANGER_ID, 0));
 		System.out.println("AIRSUPPLY: Stopped");
 	}
 
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/CodeReader.java b/src/de/c3seidenstrasse/networkcontroller/network/CodeReader.java
index f88548a..9d4fe84 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/CodeReader.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/CodeReader.java
@@ -1,8 +1,8 @@
 package de.c3seidenstrasse.networkcontroller.network;
 
-import java.util.HashSet;
 import java.util.LinkedList;
-import java.util.Set;
+import java.util.Map;
+import java.util.TreeMap;
 
 import com.google.gson.annotations.Expose;
 
@@ -12,6 +12,7 @@
 import de.c3seidenstrasse.networkcontroller.utils.NoAttachmentException;
 import de.c3seidenstrasse.networkcontroller.utils.NotFoundException;
 import de.c3seidenstrasse.networkcontroller.utils.RouteNotFoundException;
+import de.c3seidenstrasse.networkcontroller.utils.SpaceOccupiedException;
 import de.c3seidenstrasse.networkcontroller.utils.TreeIntegrityException;
 import javafx.scene.control.TreeItem;
 
@@ -26,8 +27,8 @@ public String toString() {
 
 	private NetworkComponent child;
 
-	public CodeReader(final Integer id, final Network network) throws IdAlreadyExistsException {
-		super(id, network);
+	public CodeReader(final Integer id, final Network network, int duration) throws IdAlreadyExistsException, NoAttachmentException, TreeIntegrityException, SpaceOccupiedException {
+		super(id, network, null, 0, duration);
 		this.setCurrentExit(1);
 	}
 
@@ -37,14 +38,14 @@ public NetworkComponent getParent() throws NoAttachmentException {
 	}
 
 	@Override
-	public Set<IndexedNetworkComponent> getIndexedChildren() {
-		final Set<IndexedNetworkComponent> set = new HashSet<>();
-		set.add(new IndexedNetworkComponent(this.getChild(), 1, 5));
+	public Map<Integer,NetworkComponent> getIndexedChildren() {
+		final Map<Integer,NetworkComponent> set = new TreeMap<>();
+		set.put(0,child);
 		return set;
 	}
 
 	@Override
-	protected void addChildAt(final Integer position, final NetworkComponent nc, final int transferDuration)
+	protected void addChildAt(final Integer position, final NetworkComponent nc)
 			throws TreeIntegrityException, NoAttachmentException {
 		if (!position.equals(1))
 			throw new NoAttachmentException("There is no attachment at position " + position.toString());
@@ -53,10 +54,10 @@ protected void addChildAt(final Integer position, final NetworkComponent nc, fin
 
 	@Override
 	public Exit createExitAt(final Integer position, final Integer id, final String name, final int transferDuration)
-			throws NoAttachmentException, IdAlreadyExistsException {
-		final Exit e = new Exit(id, name, this.getNetwork(), this);
+			throws NoAttachmentException, IdAlreadyExistsException, TreeIntegrityException, SpaceOccupiedException {
+		final Exit e = new Exit(id, name, this.getNetwork(), this, position, transferDuration);
 		try {
-			this.addChildAt(position, e, transferDuration);
+			this.addChildAt(position, e);
 		} catch (final TreeIntegrityException e1) {
 			throw new Error(); // should not happen
 		}
@@ -65,10 +66,10 @@ public Exit createExitAt(final Integer position, final Integer id, final String
 
 	@Override
 	public Router createRouterAt(final Integer position, final Integer id, final String name,
-			final int transferDuration) throws NoAttachmentException, IdAlreadyExistsException {
-		final Router r = new Router(id, name, this.getNetwork(), this);
+			final int transferDuration) throws NoAttachmentException, IdAlreadyExistsException, TreeIntegrityException, SpaceOccupiedException {
+		final Router r = new Router(id, name, this.getNetwork(), this, position, transferDuration);
 		try {
-			this.addChildAt(position, r, transferDuration);
+			this.addChildAt(position, r);
 		} catch (final TreeIntegrityException e1) {
 			throw new Error(); // should not happen
 		}
@@ -78,29 +79,14 @@ public Router createRouterAt(final Integer position, final Integer id, final Str
 	@Override
 	public void fillRoute(final Transport t, final NetworkComponent target) {
 		if (this.hasChild(target)) {
-			t.addDown(new IndexedNetworkComponent(this, 1, 5));
+			t.addDown(this);
 			this.getChild().fillRoute(t, target);
 		} else
 			throw new Error();
 	}
 
 	@Override
-	public Integer getPositionOf(final NetworkComponent child) throws NotFoundException {
-		if (this.getChild().equals(child))
-			return 1;
-		throw new NotFoundException();
-	}
-
-	@Override
-	public IndexedNetworkComponent getIncOf(final NetworkComponent child)
-			throws NotFoundException, NoAttachmentException {
-		if (this.getChild().equals(child))
-			return new IndexedNetworkComponent(this.getChild(), 1, 5);
-		throw new NotFoundException();
-	}
-
-	@Override
-	public LinkedList<IndexedNetworkComponent> RouteTo(final NetworkComponent target) throws RouteNotFoundException {
+	public LinkedList<NetworkComponent> RouteTo(final NetworkComponent target) throws RouteNotFoundException {
 		return this.getChild().RouteTo(target);
 	}
 
@@ -120,7 +106,7 @@ public void create33c3() {
 			caty.createExitAt(4, 8, "Lounge", 130);
 			caty.createExitAt(3, 9, "FoodHacker", 140);
 			caty.createExitAt(2, 10, "Monolith", 150);
-		} catch (final NoAttachmentException | IdAlreadyExistsException e) {
+		} catch (final NoAttachmentException | IdAlreadyExistsException | TreeIntegrityException | SpaceOccupiedException e) {
 			e.printStackTrace();
 		}
 	}
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/Exit.java b/src/de/c3seidenstrasse/networkcontroller/network/Exit.java
index 01d1ed4..345b958 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/Exit.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/Exit.java
@@ -1,8 +1,8 @@
 package de.c3seidenstrasse.networkcontroller.network;
 
-import java.util.HashSet;
 import java.util.LinkedList;
-import java.util.Set;
+import java.util.Map;
+import java.util.TreeMap;
 
 import com.google.gson.annotations.Expose;
 
@@ -10,21 +10,20 @@
 import de.c3seidenstrasse.networkcontroller.route.Transport;
 import de.c3seidenstrasse.networkcontroller.utils.IdAlreadyExistsException;
 import de.c3seidenstrasse.networkcontroller.utils.NoAttachmentException;
-import de.c3seidenstrasse.networkcontroller.utils.NotFoundException;
 import de.c3seidenstrasse.networkcontroller.utils.RouteNotFoundException;
+import de.c3seidenstrasse.networkcontroller.utils.SpaceOccupiedException;
+import de.c3seidenstrasse.networkcontroller.utils.TreeIntegrityException;
 import javafx.scene.control.TreeItem;
 
 public class Exit extends NetworkComponent {
 
 	private static final String AN_EXIT_HAS_NO_ATTACHMENT = "An exit has no attachment.";
-	private final NetworkComponent parent;
 	@Expose
 	private final String name;
 
-	Exit(final Integer id, final String name, final Network network, final NetworkComponent parent)
-			throws IdAlreadyExistsException {
-		super(id, network);
-		this.parent = parent;
+	Exit(final Integer id, final String name, final Network network, final NetworkComponent parent, int i, int duration)
+			throws IdAlreadyExistsException, NoAttachmentException, TreeIntegrityException, SpaceOccupiedException {
+		super(id, network, parent, i, duration);
 		this.name = name;
 		this.setCurrentExit(1);
 	}
@@ -35,12 +34,12 @@ public NetworkComponent getParent() {
 	}
 
 	@Override
-	public Set<IndexedNetworkComponent> getIndexedChildren() {
-		return new HashSet<>();
+	public Map<Integer,NetworkComponent> getIndexedChildren() {
+		return new TreeMap<>();
 	}
 
 	@Override
-	protected void addChildAt(final Integer position, final NetworkComponent nc, final int transferDuration)
+	protected void addChildAt(final Integer position, final NetworkComponent nc)
 			throws NoAttachmentException {
 		throw new NoAttachmentException(Exit.AN_EXIT_HAS_NO_ATTACHMENT);
 	}
@@ -51,11 +50,6 @@ public Exit createExitAt(final Integer position, final Integer id, final String
 		throw new NoAttachmentException(Exit.AN_EXIT_HAS_NO_ATTACHMENT);
 	}
 
-	@Override
-	public String toString() {
-		return this.getName();
-	}
-
 	@Override
 	public Router createRouterAt(final Integer position, final Integer id, final String name,
 			final int transferDuration) throws NoAttachmentException {
@@ -65,32 +59,18 @@ public Router createRouterAt(final Integer position, final Integer id, final Str
 	@Override
 	public void fillRoute(final Transport t, final NetworkComponent target) {
 		if (!this.hasChild(target)) {
-			try {
-				t.addUp(new IndexedNetworkComponent(this, 1, this.parent.getIncOf(this).getTransferDuration()));
-			} catch (NotFoundException | NoAttachmentException e) {
-				// should not happen
-			}
+			t.addUp(this);
 			this.parent.fillRoute(t, target);
 		} else {
-			t.addDown(new IndexedNetworkComponent(this, 1, 5));
+			t.addDown(this);
 		}
 	}
 
 	@Override
-	public Integer getPositionOf(final NetworkComponent child) throws NoAttachmentException {
-		throw new NoAttachmentException(Exit.AN_EXIT_HAS_NO_ATTACHMENT);
-	}
-
-	@Override
-	public IndexedNetworkComponent getIncOf(final NetworkComponent child) throws NoAttachmentException {
-		throw new NoAttachmentException(Exit.AN_EXIT_HAS_NO_ATTACHMENT);
-	}
-
-	@Override
-	public LinkedList<IndexedNetworkComponent> RouteTo(final NetworkComponent target) throws RouteNotFoundException {
+	public LinkedList<NetworkComponent> RouteTo(final NetworkComponent target) throws RouteNotFoundException {
 		if (this.equals(target)) {
-			final LinkedList<IndexedNetworkComponent> route = new LinkedList<>();
-			// route.addFirst(new IndexedNetworkComponent(this, 1));
+			final LinkedList<NetworkComponent> route = new LinkedList<>();
+			// route.addFirst(new NetworkComponent(this, 1));
 			return route;
 		}
 		throw new RouteNotFoundException();
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/IndexedNetworkComponent.java b/src/de/c3seidenstrasse/networkcontroller/network/IndexedNetworkComponent.java
deleted file mode 100644
index 42a59a2..0000000
--- a/src/de/c3seidenstrasse/networkcontroller/network/IndexedNetworkComponent.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package de.c3seidenstrasse.networkcontroller.network;
-
-import com.google.gson.annotations.Expose;
-
-public final class IndexedNetworkComponent {
-	@Override
-	public String toString() {
-		return "[nc=" + this.nc + ", i=" + this.i + ", transDur=" + this.transferDuration + "]";
-	}
-
-	@Expose
-	private final NetworkComponent nc;
-	@Expose
-	private final Integer i;
-	@Expose
-	private final Integer transferDuration;
-
-	public IndexedNetworkComponent(final NetworkComponent nc, final Integer i, final int transferDuration) {
-		this.nc = nc;
-		this.i = i;
-		this.transferDuration = transferDuration;
-	}
-
-	final public Integer getI() {
-		return this.i;
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + (this.i == null ? 0 : this.i.hashCode());
-		result = prime * result + (this.nc == null ? 0 : this.nc.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(final Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (this.getClass() != obj.getClass())
-			return false;
-		final IndexedNetworkComponent other = (IndexedNetworkComponent) obj;
-		if (this.i == null) {
-			if (other.i != null)
-				return false;
-		} else if (!this.i.equals(other.i))
-			return false;
-		if (this.nc == null) {
-			if (other.nc != null)
-				return false;
-		} else if (!this.nc.equals(other.nc))
-			return false;
-		return true;
-	}
-
-	final public NetworkComponent getNc() {
-		return this.nc;
-	}
-
-	public Integer getTransferDuration() {
-		return this.transferDuration;
-	}
-}
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/NetworkComponent.java b/src/de/c3seidenstrasse/networkcontroller/network/NetworkComponent.java
index 137276e..bdde34e 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/NetworkComponent.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/NetworkComponent.java
@@ -3,15 +3,16 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.Map;
 import java.util.Set;
 
 import de.c3seidenstrasse.networkcontroller.route.Network;
 import de.c3seidenstrasse.networkcontroller.route.Transport;
+import de.c3seidenstrasse.networkcontroller.utils.IdAlreadyExistsException;
+import de.c3seidenstrasse.networkcontroller.utils.NetworkComponentObservee;
 import de.c3seidenstrasse.networkcontroller.utils.NoAttachmentException;
 import de.c3seidenstrasse.networkcontroller.utils.NotFoundException;
 import de.c3seidenstrasse.networkcontroller.utils.ObserverEvent;
-import de.c3seidenstrasse.networkcontroller.utils.IdAlreadyExistsException;
-import de.c3seidenstrasse.networkcontroller.utils.NetworkComponentObservee;
 import de.c3seidenstrasse.networkcontroller.utils.RouteNotFoundException;
 import de.c3seidenstrasse.networkcontroller.utils.SpaceOccupiedException;
 import de.c3seidenstrasse.networkcontroller.utils.TreeIntegrityException;
@@ -22,16 +23,40 @@
  *
  * @author clarity
  */
-public abstract class NetworkComponent extends NetworkComponentObservee {
+public abstract class NetworkComponent extends NetworkComponentObservee implements Comparable<NetworkComponent> {
 	private Integer currentExit;
 	private final Network network;
+	
 	private final Integer id;
+	private final Integer indexInParent;
+	private final Integer transferDuration;
+	
+	protected NetworkComponent parent;
 
-	NetworkComponent(final Integer id, final Network network) throws IdAlreadyExistsException {
+	NetworkComponent(final Integer id, final Network network, NetworkComponent parent, int indexInParent, int duration) throws IdAlreadyExistsException, NoAttachmentException, TreeIntegrityException, SpaceOccupiedException {
 		this.network = network;
 		this.id = id;
+		this.parent = parent;
+		this.indexInParent = indexInParent;
+		this.transferDuration = duration;
 		network.addNodeToMap(id, this);
 		this.setCurrentExit(0);
+		if(parent != null) {
+			parent.addChildAt(indexInParent, this);
+		}
+	}
+	
+	public Integer getIndexInParent() {
+		return indexInParent;
+	}
+
+	public Integer getTransferDuration() {
+		return transferDuration;
+	}
+
+	@Override
+	public String toString() {
+		return indexInParent + " " + id + " " + getName();
 	}
 
 	/**
@@ -42,25 +67,9 @@ public abstract class NetworkComponent extends NetworkComponentObservee {
 	 * @throws NoAttachmentException
 	 *             if this component has no parent attached
 	 */
-	public abstract NetworkComponent getParent() throws NoAttachmentException;
-
-	/**
-	 * returns the position of a specified child element below this
-	 * NetworkComponent
-	 *
-	 * @param child
-	 *            The NetworkComponent you are looking for
-	 * @return The attachment number where the child is connected
-	 * @throws NotFoundException
-	 *             if the specified {@code child} is not directly below this
-	 *             NetworkComponent
-	 * @throws NoAttachmentException
-	 *             if the specified {@code child} has no attachments
-	 */
-	public abstract Integer getPositionOf(final NetworkComponent child) throws NotFoundException, NoAttachmentException;
-
-	public abstract IndexedNetworkComponent getIncOf(final NetworkComponent child)
-			throws NotFoundException, NoAttachmentException;
+	public NetworkComponent getParent() throws NoAttachmentException {
+		return parent;
+	}
 
 	/**
 	 * returns the {@linkplain NetworkComponent} which is at the position
@@ -87,7 +96,7 @@ public abstract IndexedNetworkComponent getIncOf(final NetworkComponent child)
 	 *
 	 * @return a set of all children
 	 */
-	public abstract Set<IndexedNetworkComponent> getIndexedChildren();
+	public abstract Map<Integer,NetworkComponent>  getIndexedChildren();
 
 	/**
 	 * outputs the set of all children
@@ -96,9 +105,9 @@ public abstract IndexedNetworkComponent getIncOf(final NetworkComponent child)
 	 */
 	public Set<NetworkComponent> getChildren() {
 		final HashSet<NetworkComponent> set = new HashSet<>();
-		final Iterator<IndexedNetworkComponent> i = this.getIndexedChildren().iterator();
+		final Iterator<NetworkComponent> i = this.getIndexedChildren().values().iterator();
 		while (i.hasNext())
-			set.add(i.next().getNc());
+			set.add(i.next());
 		return set;
 	}
 
@@ -115,25 +124,36 @@ public Set<NetworkComponent> getChildren() {
 	 * @throws TreeIntegrityException
 	 *             if this would create a circle
 	 */
-	protected abstract void addChildAt(Integer position, NetworkComponent nc, int transferDuration)
+	protected abstract void addChildAt(Integer position, NetworkComponent nc)
 			throws NoAttachmentException, TreeIntegrityException, SpaceOccupiedException;
 
-	public abstract Exit createExitAt(Integer position, final Integer id, String name, int transferDuration)
-			throws NoAttachmentException, IdAlreadyExistsException;
-
+	public Exit createExitAt(final Integer position, final Integer id, final String name, final int transferDuration)
+			throws IdAlreadyExistsException, NoAttachmentException, TreeIntegrityException, SpaceOccupiedException {
+		final Exit e = new Exit(id, name, this.getNetwork(), this, position, transferDuration);
+		return e;
+	}
 	public abstract Router createRouterAt(Integer position, final Integer id, String Name, int transferDuration)
-			throws NoAttachmentException, IdAlreadyExistsException;
+			throws NoAttachmentException, IdAlreadyExistsException, TreeIntegrityException, SpaceOccupiedException;
 
 	public abstract void fillRoute(Transport t, NetworkComponent target);
 
-	public abstract LinkedList<IndexedNetworkComponent> RouteTo(NetworkComponent target) throws RouteNotFoundException;
+	public abstract LinkedList<NetworkComponent> RouteTo(NetworkComponent target) throws RouteNotFoundException;
 
+	@Override
+	public int compareTo(NetworkComponent o) {
+		return this.id.compareTo(o.id);
+	}
+	
 	public boolean hasChild(final NetworkComponent nc) {
 		if (this.equals(nc))
 			return true;
-		final Iterator<IndexedNetworkComponent> i = this.getIndexedChildren().iterator();
+		Map<Integer, NetworkComponent> indexedChildren = this.getIndexedChildren();
+		if(indexedChildren == null) {
+			return false;
+		}
+		final Iterator<NetworkComponent> i = indexedChildren.values().iterator();
 		while (i.hasNext())
-			if (i.next().getNc().hasChild(nc))
+			if (i.next().hasChild(nc))
 				return true;
 		return false;
 	}
@@ -156,11 +176,11 @@ public NetworkComponent getIntersectionOf(final NetworkComponent first, final Ne
 		nc.add(second);
 
 		if (this.hasAllChilds(nc)) {
-			final Iterator<IndexedNetworkComponent> iterator = this.getIndexedChildren().iterator();
+			final Iterator<NetworkComponent> iterator = this.getIndexedChildren().values().iterator();
 			while (iterator.hasNext()) {
-				final IndexedNetworkComponent current = iterator.next();
-				if (current.getNc().hasAllChilds(nc)) {
-					return current.getNc().getIntersectionOf(first, second);
+				final NetworkComponent current = iterator.next();
+				if (current.hasAllChilds(nc)) {
+					return current.getIntersectionOf(first, second);
 				}
 			}
 			return this;
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/Router.java b/src/de/c3seidenstrasse/networkcontroller/network/Router.java
index 5184e0e..534e82a 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/Router.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/Router.java
@@ -1,12 +1,14 @@
 package de.c3seidenstrasse.networkcontroller.network;
 
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.Set;
+import java.util.Map;
+import java.util.TreeMap;
 
 import com.google.gson.annotations.Expose;
 
+import de.c3seidenstrasse.networkcontroller.route.Message;
+import de.c3seidenstrasse.networkcontroller.route.Message.MessageType;
 import de.c3seidenstrasse.networkcontroller.route.Network;
 import de.c3seidenstrasse.networkcontroller.route.Transport;
 import de.c3seidenstrasse.networkcontroller.utils.IdAlreadyExistsException;
@@ -26,54 +28,36 @@ public class Router extends NetworkComponent {
 
 	private final NetworkComponent parent;
 	@Expose
-	private final Set<IndexedNetworkComponent> childs;
+	private final TreeMap<Integer, NetworkComponent> childrenByIndex;
 
 	@Expose
 	private final String name;
 
-	Router(final Integer id, final String name, final Network network, final NetworkComponent parent)
-			throws IdAlreadyExistsException {
-		super(id, network);
+	Router(final Integer id, final String name, final Network network, final NetworkComponent parent, int i, int duration)
+			throws IdAlreadyExistsException, NoAttachmentException, TreeIntegrityException, SpaceOccupiedException {
+		super(id, network, parent, i, duration);
 		this.parent = parent;
-		this.childs = new HashSet<>();
+		this.childrenByIndex = new TreeMap<>();
 		this.name = name;
 	}
 
 	@Override
-	public NetworkComponent getParent() throws NoAttachmentException {
-		if (this.parent == null)
-			throw new NoAttachmentException();
-		return this.parent;
+	public Map<Integer,NetworkComponent> getIndexedChildren() {
+		return this.childrenByIndex;
 	}
 
 	@Override
-	public Set<IndexedNetworkComponent> getIndexedChildren() {
-		return this.childs;
-	}
-
-	@Override
-	public void addChildAt(final Integer position, final NetworkComponent nc, final int transferDuration)
+	public void addChildAt(final Integer position, final NetworkComponent nc)
 			throws TreeIntegrityException, SpaceOccupiedException {
-		this.addChild(new IndexedNetworkComponent(nc, position, transferDuration));
-	}
-
-	// pull up?
-	@Override
-	public Integer getPositionOf(final NetworkComponent child) throws NotFoundException {
-		final Iterator<IndexedNetworkComponent> i = this.childs.iterator();
-		while (i.hasNext()) {
-			final IndexedNetworkComponent current = i.next();
-			if (current.getNc().equals(child))
-				return current.getI();
-		}
-		throw new NotFoundException("No Position found for " + child.toString());
+		assert(position == nc.getIndexInParent());
+		this.addChild(nc);
 	}
 
-	public IndexedNetworkComponent getIncOf(final NetworkComponent child) throws NotFoundException {
-		final Iterator<IndexedNetworkComponent> i = this.childs.iterator();
+	public NetworkComponent getIncOf(final NetworkComponent child) throws NotFoundException {
+		final Iterator<NetworkComponent> i = this.childrenByIndex.values().iterator();
 		while (i.hasNext()) {
-			final IndexedNetworkComponent current = i.next();
-			if (current.getNc().equals(child))
+			final NetworkComponent current = i.next();
+			if (current.equals(child))
 				return current;
 		}
 		throw new NotFoundException("No Position found for " + child.toString());
@@ -81,67 +65,50 @@ public IndexedNetworkComponent getIncOf(final NetworkComponent child) throws Not
 
 	@Override
 	public NetworkComponent getChildAt(final Integer position) throws NoAttachmentException {
-		final Iterator<IndexedNetworkComponent> i = this.childs.iterator();
+		final Iterator<NetworkComponent> i = this.childrenByIndex.values().iterator();
 		while (i.hasNext()) {
-			final IndexedNetworkComponent current = i.next();
-			if (current.getI().equals(position))
-				return current.getNc();
+			final NetworkComponent current = i.next();
+			if (current.getIndexInParent().equals(position))
+				return current;
 		}
 		throw new NoAttachmentException("No Attachment at position " + position);
 	}
 
-	private void addChild(final IndexedNetworkComponent inc) throws TreeIntegrityException, SpaceOccupiedException {
-		if (inc.getNc().hasChild(this))
-			throw new TreeIntegrityException(this.toString() + "is already a child of " + inc.getNc().toString());
+	private void addChild(final NetworkComponent inc) throws TreeIntegrityException, SpaceOccupiedException {
+		if (inc.hasChild(this))
+			throw new TreeIntegrityException(this.toString() + "is already a child of " + inc.toString());
 		try {
-			if (!inc.getNc().getParent().equals(this))
-				throw new TreeIntegrityException("Parent on " + inc.getNc().toString() + "is not set properly!");
+			if (!inc.getParent().equals(this))
+				throw new TreeIntegrityException("Parent on " + inc.toString() + "is not set properly!");
 		} catch (final NoAttachmentException e1) {
-			throw new TreeIntegrityException("Parent on " + inc.getNc().toString() + "is not set!");
+			throw new TreeIntegrityException("Parent on " + inc.toString() + "is not set!");
 		}
 
 		try {
-			this.getChildAt(inc.getI());
+			this.getChildAt(inc.getIndexInParent());
 		} catch (final NoAttachmentException e) {
 			// no child on this position
-			this.childs.add(inc);
+			this.childrenByIndex.put(inc.getIndexInParent(),inc);
 			return;
 		}
-		throw new SpaceOccupiedException(this.toString() + " has already a child at " + inc.getI());
-	}
-
-	@Override
-	public Exit createExitAt(final Integer position, final Integer id, final String name, final int transferDuration)
-			throws IdAlreadyExistsException {
-		final Exit e = new Exit(id, name, this.getNetwork(), this);
-		try {
-			this.addChildAt(position, e, transferDuration);
-		} catch (SpaceOccupiedException | TreeIntegrityException e1) {
-			throw new Error(); // should not happen
-		}
-		return e;
+		throw new SpaceOccupiedException(this.toString() + " has already a child at " + inc.getIndexInParent());
 	}
 
 	@Override
 	public Router createRouterAt(final Integer position, final Integer id, final String name,
-			final int transferDuration) throws IdAlreadyExistsException {
-		final Router r = new Router(id, name, this.getNetwork(), this);
-		try {
-			this.addChildAt(position, r, transferDuration);
-		} catch (final TreeIntegrityException | SpaceOccupiedException e) {
-			throw new Error(); // Should not happen
-		}
+			final int transferDuration) throws IdAlreadyExistsException, NoAttachmentException, TreeIntegrityException, SpaceOccupiedException {
+		final Router r = new Router(id, name, this.getNetwork(), this, position, transferDuration);
 		return r;
 	}
 
 	/**
 	 * return INC with the next hop and node
 	 */
-	private IndexedNetworkComponent getNextExitFor(final NetworkComponent nc) throws NotFoundException {
-		final Iterator<IndexedNetworkComponent> i = this.childs.iterator();
+	private NetworkComponent getNextExitFor(final NetworkComponent nc) throws NotFoundException {
+		final Iterator<NetworkComponent> i = this.childrenByIndex.values().iterator();
 		while (i.hasNext()) {
-			final IndexedNetworkComponent inc = i.next();
-			if (inc.getNc().hasChild(nc))
+			final NetworkComponent inc = i.next();
+			if (inc.hasChild(nc))
 				return inc;
 		}
 		throw new NotFoundException();
@@ -153,21 +120,21 @@ public void fillRoute(final Transport t, final NetworkComponent target) {
 			// ziel ist unter mir, down list
 			final Integer nextExitFor;
 			try {
-				final IndexedNetworkComponent inc = this.getNextExitFor(target);
-				t.addDown(new IndexedNetworkComponent(this, inc.getI(), inc.getTransferDuration()));
-				this.getChildAt(inc.getI()).fillRoute(t, target); // TODO
+				final NetworkComponent inc = this.getNextExitFor(target);
+				t.addDown(this);
+				this.getChildAt(inc.getIndexInParent()).fillRoute(t, target); // TODO
 																	// replace
 																	// by
-																	// inc.getNc()
+																	// inc
 			} catch (final NoAttachmentException | NotFoundException e) {
 				throw new Error(); // should not happen, structure is not
 									// correct
 			}
 		} else {
-			// ziel ist über mir, up list
+			// ziel ist �ber mir, up list
 			try {
-				final IndexedNetworkComponent deruntermir = this.getIncOf(t.getLastUp());
-				t.addUp(new IndexedNetworkComponent(this, deruntermir.getI(), deruntermir.getTransferDuration()));
+				final NetworkComponent deruntermir = this.getIncOf(t.getLastUp());
+				t.addUp(this);
 			} catch (final NotFoundException e) {
 				throw new Error(); // should not happen, structure is not
 									// correct
@@ -177,24 +144,19 @@ public void fillRoute(final Transport t, final NetworkComponent target) {
 	}
 
 	@Override
-	public String toString() {
-		return this.getName();
-	}
-
-	@Override
-	public LinkedList<IndexedNetworkComponent> RouteTo(final NetworkComponent target) throws RouteNotFoundException {
-		LinkedList<IndexedNetworkComponent> route;
+	public LinkedList<NetworkComponent> RouteTo(final NetworkComponent target) throws RouteNotFoundException {
+		LinkedList<NetworkComponent> route;
 		if (this.equals(target)) {
 			route = new LinkedList<>();
 		} else {
-			IndexedNetworkComponent via;
+			NetworkComponent via;
 			try {
 				via = this.getNextExitFor(target);
 			} catch (final NotFoundException e) {
 				throw new RouteNotFoundException(e);
 			}
-			route = via.getNc().RouteTo(target);
-			route.addFirst(new IndexedNetworkComponent(this, via.getI(), via.getTransferDuration()));
+			route = via.RouteTo(target);
+			route.addFirst(this);
 		}
 		return route;
 	}
@@ -209,19 +171,17 @@ public String getName() {
 	 * asynchronous
 	 */
 	@Override
-	public void turnTo(final Integer Exit) {
-		final byte[] message = { 0x01, 0x00, (byte) (int) this.getId(), (byte) (int) Exit, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-		this.getNetwork().send(message);
+	public void turnTo(final Integer exit) {
+		this.getNetwork().send(new Message(MessageType.CONNECT, 0, getId(), exit));
 	}
 
 	@Override
 	public TreeItem<NetworkComponent> getTreeItem() {
 		final TreeItem<NetworkComponent> root = new TreeItem<>(this);
 		root.setExpanded(true);
-		final Iterator<IndexedNetworkComponent> i = this.childs.iterator();
+		final Iterator<NetworkComponent> i = this.childrenByIndex.values().iterator();
 		while (i.hasNext())
-			root.getChildren().add(i.next().getNc().getTreeItem());
+			root.getChildren().add(i.next().getTreeItem());
 		return root;
 	}
 
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/states/NetworkState.java b/src/de/c3seidenstrasse/networkcontroller/network/states/NetworkState.java
index 56d3b4e..f3f3841 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/states/NetworkState.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/states/NetworkState.java
@@ -2,34 +2,26 @@
 
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
-import de.c3seidenstrasse.networkcontroller.network.IndexedNetworkComponent;
 import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
+import de.c3seidenstrasse.networkcontroller.network.Router;
 import de.c3seidenstrasse.networkcontroller.route.Transport;
 import de.c3seidenstrasse.networkcontroller.utils.NoCurrentTransportException;
 
 public abstract class NetworkState {
-	protected final Set<IndexedNetworkComponent> waiting;
+	protected final Map<Router, Integer> directionForRouter;
 
 	public abstract void accept(NetworkStateVisitor nsv);
 
 	NetworkState() {
-		this.waiting = new HashSet<>();
+		this.directionForRouter = new TreeMap<>();
 	}
 
 	public boolean isFinished() {
-		return this.waiting.isEmpty();
-	}
-
-	public void hasFinished(final NetworkComponent nc) {
-		final Iterator<IndexedNetworkComponent> i = this.waiting.iterator();
-		while (i.hasNext()) {
-			if (i.next().equals(nc)) {
-				i.remove();
-				return;
-			}
-		}
+		return this.directionForRouter.isEmpty();
 	}
 
 	public abstract void arrived();
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/states/PreparePullState.java b/src/de/c3seidenstrasse/networkcontroller/network/states/PreparePullState.java
index 61b58aa..1a27851 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/states/PreparePullState.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/states/PreparePullState.java
@@ -1,5 +1,7 @@
 package de.c3seidenstrasse.networkcontroller.network.states;
 
+import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
+import de.c3seidenstrasse.networkcontroller.network.Router;
 import de.c3seidenstrasse.networkcontroller.route.Transport;
 
 public final class PreparePullState extends RouterTurningState {
@@ -12,8 +14,15 @@ public void accept(final NetworkStateVisitor nsv) {
 	public PreparePullState(final Transport t) {
 		super(t);
 		synchronized (this) {
-			this.waiting.addAll(this.getCurrentTransport().getAirflow());
-			this.waiting.addAll(this.getCurrentTransport().getUp());
+			NetworkComponent prev = t.getStart();
+			for(NetworkComponent nc : this.getCurrentTransport().getUp()) {
+				this.directionForRouter.put((Router)nc, prev.getIndexInParent());
+				prev = nc;
+			}			
+			for(NetworkComponent nc : this.getCurrentTransport().getAirflow()) {
+				this.directionForRouter.put((Router)nc, prev.getIndexInParent());
+				prev = nc;
+			}
 		}
 	}
 }
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/states/PreparePushState.java b/src/de/c3seidenstrasse/networkcontroller/network/states/PreparePushState.java
index 4ee52d4..fdf597a 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/states/PreparePushState.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/states/PreparePushState.java
@@ -1,5 +1,7 @@
 package de.c3seidenstrasse.networkcontroller.network.states;
 
+import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
+import de.c3seidenstrasse.networkcontroller.network.Router;
 import de.c3seidenstrasse.networkcontroller.route.Transport;
 
 public class PreparePushState extends RouterTurningState {
@@ -12,7 +14,17 @@ public void accept(final NetworkStateVisitor nsv) {
 	public PreparePushState(final Transport t) {
 		super(t);
 		synchronized (this) {
-			this.waiting.addAll(this.getCurrentTransport().getDown());
+
+			Router prev = null;
+			for(NetworkComponent nc : this.getCurrentTransport().getDown()) {
+				if(prev == null) {
+					prev = (Router)nc;
+				} else {
+					this.directionForRouter.put(prev, nc.getIndexInParent());
+					prev = (Router)nc;
+				}
+			}
+			this.directionForRouter.put(prev, t.getEnde().getIndexInParent());
 		}
 	}
 }
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/states/PullState.java b/src/de/c3seidenstrasse/networkcontroller/network/states/PullState.java
index d26c3ec..620256b 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/states/PullState.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/states/PullState.java
@@ -2,7 +2,10 @@
 
 import java.util.TimerTask;
 
+import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
+import de.c3seidenstrasse.networkcontroller.route.Message;
 import de.c3seidenstrasse.networkcontroller.route.Transport;
+import de.c3seidenstrasse.networkcontroller.route.Message.MessageType;
 
 public class PullState extends CapsuleTransportState {
 
@@ -18,9 +21,8 @@ public void accept(final NetworkStateVisitor nsv) {
 	@Override
 	public void doYourThing() {
 		this.t.getNetwork().getAirsupplier().pull();
-		final byte[] message = { 0x06, 0x00, (byte) (int) this.t.getStart().getId(), 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-		this.t.getNetwork().send(message);
+		// FIXME I put start and end into bytes 1 and 3, is this correct?
+		this.t.getNetwork().send(new Message(MessageType.STARTED, this.t.getStart().getId(), 0, this.t.getEnde().getId()));
 
 		final TimerTask tt = new TimerTask() {
 			@Override
@@ -29,6 +31,12 @@ public void run() {
 				PullState.this.arrived();
 			};
 		};
-		PullState.this.timer.schedule(tt, 120000);
+		int duration =  t.getStart().getTransferDuration();
+		for(NetworkComponent inc : t.getUp()) {
+			duration += inc.getTransferDuration();
+		}
+		duration -= t.getLastUp().getTransferDuration();
+		System.out.println("Computed transfer duration is " + duration);
+		PullState.this.timer.schedule(tt, duration * 1000);
 	}
 }
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/states/PushState.java b/src/de/c3seidenstrasse/networkcontroller/network/states/PushState.java
index f48dad9..b2eebf1 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/states/PushState.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/states/PushState.java
@@ -2,6 +2,7 @@
 
 import java.util.TimerTask;
 
+import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
 import de.c3seidenstrasse.networkcontroller.route.Transport;
 
 public class PushState extends CapsuleTransportState {
@@ -25,6 +26,12 @@ public void run() {
 				PushState.this.arrived();
 			};
 		};
-		PushState.this.timer.schedule(tt, 120000);
+		int duration =  t.getStart().getTransferDuration();
+		for(NetworkComponent inc : t.getDown()) {
+			duration += inc.getTransferDuration();
+		}
+		duration -= t.getDown().getLast().getTransferDuration();
+		System.out.println("Computed transfer duration is " + duration);
+		PushState.this.timer.schedule(tt, duration * 1000);
 	}
 }
diff --git a/src/de/c3seidenstrasse/networkcontroller/network/states/RouterTurningState.java b/src/de/c3seidenstrasse/networkcontroller/network/states/RouterTurningState.java
index 83f7968..a54c7a8 100644
--- a/src/de/c3seidenstrasse/networkcontroller/network/states/RouterTurningState.java
+++ b/src/de/c3seidenstrasse/networkcontroller/network/states/RouterTurningState.java
@@ -1,10 +1,7 @@
 package de.c3seidenstrasse.networkcontroller.network.states;
 
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import de.c3seidenstrasse.networkcontroller.network.IndexedNetworkComponent;
 import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
+import de.c3seidenstrasse.networkcontroller.network.Router;
 import de.c3seidenstrasse.networkcontroller.route.Transport;
 import de.c3seidenstrasse.networkcontroller.utils.Observer;
 import de.c3seidenstrasse.networkcontroller.utils.ObserverEvent;
@@ -26,14 +23,12 @@ public Transport getCurrentTransport() {
 	};
 
 	public void enforceRouterPositions() {
-		final Iterator<IndexedNetworkComponent> i = new LinkedList<>(this.waiting).iterator();
-		while (i.hasNext()) {
-			final IndexedNetworkComponent current = i.next();
-			current.getNc().register(this, ObserverEvent.POSITIONCHANGED);
-			current.getNc().turnTo(current.getI()); // Es muss gedreht
-													// werden
+		for (Router r : this.directionForRouter.keySet()) {
+			Integer direction = this.directionForRouter.get(r);
+			r.register(this, ObserverEvent.POSITIONCHANGED);
+			r.turnTo(direction);
 		}
-		if (this.waiting.isEmpty())
+		if (this.directionForRouter.isEmpty())
 			this.t.getNetwork().awake();
 	}
 
@@ -43,17 +38,12 @@ public synchronized void update(final NetworkComponent nc) {
 	}
 
 	private synchronized void removeFromWaitingList(final NetworkComponent nc) {
-		final Iterator<IndexedNetworkComponent> i = this.waiting.iterator();
-		boolean isDeleted = false;
-		while (i.hasNext() && !isDeleted) {
-			final IndexedNetworkComponent current = i.next();
-			if (current.getNc().equals(nc) && current.getI().equals(nc.getCurrentExit())) {
-				current.getNc().deregister(this, ObserverEvent.POSITIONCHANGED);
-				i.remove();
-				isDeleted = true;
-			}
+		Integer direction = directionForRouter.get(nc);
+		if(direction != null) {
+			nc.deregister(this, ObserverEvent.POSITIONCHANGED);
+			directionForRouter.remove(nc);
 		}
-		if (this.waiting.isEmpty()) {
+		if (this.directionForRouter.isEmpty()) {
 			this.getCurrentTransport().getNetwork().awake();
 		}
 	}
diff --git a/src/de/c3seidenstrasse/networkcontroller/route/Interconnect.java b/src/de/c3seidenstrasse/networkcontroller/route/Interconnect.java
new file mode 100644
index 0000000..7274146
--- /dev/null
+++ b/src/de/c3seidenstrasse/networkcontroller/route/Interconnect.java
@@ -0,0 +1,80 @@
+package de.c3seidenstrasse.networkcontroller.route;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import de.c3seidenstrasse.networkcontroller.network.Exit;
+import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
+import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
+import de.c3seidenstrasse.networkcontroller.utils.NoCurrentTransportException;
+import de.c3seidenstrasse.networkcontroller.utils.Observer;
+import de.c3seidenstrasse.networkcontroller.utils.ObserverEvent;
+import de.c3seidenstrasse.networkcontroller.utils.RouteNotFoundException;
+import javafx.collections.ObservableList;
+
+public class Interconnect implements Observer {
+	private final NetworkComponent from;
+	private final NetworkComponent to;
+	private final LinkedList<NetworkComponent> route;
+
+	private final LinkedList<NetworkComponent> unknownStatus;
+
+	private final ObservableList<Interconnect> myList;
+
+	public Interconnect(final NetworkComponent from, final NetworkComponent to,
+			final ObservableList<Interconnect> myList) throws RouteNotFoundException, NoCurrentTransportException {
+		if (!(from instanceof Exit) && !(to instanceof Exit))
+			throw new NoCurrentTransportException("A route must go from an exit to an router or vice versa!");
+
+		this.from = from;
+		this.to = to;
+
+		this.route = this.from.RouteTo(this.to);
+		this.unknownStatus = new LinkedList<>(this.route);
+
+		this.myList = myList;
+	}
+
+	@Override
+	public String toString() {
+		return "Interconnect [from=" + this.from + ", to=" + this.to + "]";
+	}
+
+	synchronized public void setUpRoute() {
+		this.from.getNetwork().getAirsupplier().stop();
+		try {
+			Thread.sleep(1000);
+		} catch (final InterruptedException e) {
+		}
+
+		this.route.forEach((inc) -> {
+			inc.register(this, ObserverEvent.POSITIONCHANGED);
+			inc.turnTo(inc.getIndexInParent());
+		});
+	}
+
+	synchronized public void check() {
+		if (this.unknownStatus.size() == 0) {
+			this.myList.remove(this);
+		}
+
+		this.route.forEach((inc) -> {
+			inc.deregister(this, ObserverEvent.POSITIONCHANGED);
+		});
+	}
+
+	@Override
+	synchronized public void update(final NetworkComponent nc) {
+		final Iterator<NetworkComponent> i = this.unknownStatus.iterator();
+		while (i.hasNext()) {
+			final NetworkComponent current = i.next();
+			if (current.equals(nc)) {
+				if (nc.getCurrentExit() == current.getIndexInParent()) {
+					// hat alles geklappt
+					i.remove();
+				}
+				return;
+			}
+		}
+	}
+}
diff --git a/src/de/c3seidenstrasse/networkcontroller/route/Message.java b/src/de/c3seidenstrasse/networkcontroller/route/Message.java
new file mode 100644
index 0000000..000edd2
--- /dev/null
+++ b/src/de/c3seidenstrasse/networkcontroller/route/Message.java
@@ -0,0 +1,103 @@
+package de.c3seidenstrasse.networkcontroller.route;
+
+public class Message {
+	public enum MessageType {
+		/** Kapsel erkannt */ DETECT, 
+		/** Verbindung herstellen */ CONNECT, 
+		/** Verbindung wurde hergestellt */ CONNECTED, 
+		/** Anforderung direkter Transfer */ REQUEST, 
+		/** Anforderung Barcode Transfer */ DUMMY_4, 
+		/** Best�tigung Transfer */ ACK_ROUTE, 
+		/** Transfer Start */ STARTED, 
+		/** Barcode gelesen */ BARCODE, 
+		/** */ AIRFLOW;
+	}
+	
+	private final byte[] payload;
+	public byte[] getPayload() {
+		return payload;
+	}
+
+	public boolean isIncoming() {
+		return incoming;
+	}
+
+	private final boolean incoming;
+
+	public Message(final byte[] message) {
+		this(message, false);
+	}
+	
+	static byte[] constructPayload(MessageType type, int ... furtherPayload) {
+		byte[] payload = new byte[16];
+		payload[0] = (byte)type.ordinal();
+		for(int i = 0; i < furtherPayload.length; i++)
+			payload[i+1] = (byte)furtherPayload[i];
+		return payload;
+	}
+	
+	public Message(MessageType type, int ... furtherPayload) {
+		this(constructPayload(type, furtherPayload), false);
+	}
+	
+	public Message(final byte[] message, final boolean incoming) {
+		if (message.length != 16)
+			throw new RuntimeException("Message length must be 16, is " + message.length);
+		this.payload = message;
+		this.incoming = incoming;
+	}
+	
+	public MessageType getType() {
+		int typeId = this.payload[0];
+		return MessageType.values()[typeId];
+	}
+
+	@Override
+	public String toString() {
+		String s = "";
+		if (this.incoming) {
+			s = s + "INC: ";
+		} else {
+			s = s + "OUT: ";
+		}
+		switch (getType()) {
+		case DETECT:
+			s = s + "Detect at " + this.payload[1];
+			break;
+		case CONNECT:
+			s = s + "Connect " + this.payload[2] + " to " + this.payload[3];
+			break;
+		case CONNECTED:
+			s = s + "Connected " + this.payload[1] + " to " + this.payload[3];
+			break;
+		case REQUEST:
+			s = s + "Request Route " + this.payload[1] + " to " + this.payload[3];
+			break;
+		case DUMMY_4:
+			break;
+		case ACK_ROUTE:
+			s = s + "ACK Route " + this.payload[1] + " to " + this.payload[3];
+			break;
+		case STARTED:
+			s = s + "Route " + this.payload[1] + " to " + this.payload[3] + "started";
+			break;
+		case BARCODE:
+			s = s + "Barcode " + this.payload[3] + " read";
+			break;
+		case AIRFLOW:
+			switch (this.payload[3]) {
+			case 0:
+				s = s + "Airflow stopped";
+				break;
+			case 1:
+				s = s + "Airflow Pull started";
+				break;
+			case 2:
+				s = s + "Airflow Push started";
+				break;
+			}
+			break;
+		}
+		return s;
+	}
+}
\ No newline at end of file
diff --git a/src/de/c3seidenstrasse/networkcontroller/route/Network.java b/src/de/c3seidenstrasse/networkcontroller/route/Network.java
index a45267a..c0f4551 100644
--- a/src/de/c3seidenstrasse/networkcontroller/route/Network.java
+++ b/src/de/c3seidenstrasse/networkcontroller/route/Network.java
@@ -18,7 +18,10 @@
 import de.c3seidenstrasse.networkcontroller.network.states.PushState;
 import de.c3seidenstrasse.networkcontroller.network.states.RouterTurningState;
 import de.c3seidenstrasse.networkcontroller.utils.IdAlreadyExistsException;
+import de.c3seidenstrasse.networkcontroller.utils.NoAttachmentException;
 import de.c3seidenstrasse.networkcontroller.utils.NoCurrentTransportException;
+import de.c3seidenstrasse.networkcontroller.utils.SpaceOccupiedException;
+import de.c3seidenstrasse.networkcontroller.utils.TreeIntegrityException;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -27,7 +30,7 @@ public class Network implements Runnable {
 
 	private final Thread t;
 
-	private final SssConnection sssc;
+	private SssConnection sssc = null;
 
 	private final Map<Integer, NetworkComponent> idMap;
 
@@ -41,16 +44,16 @@ private Network(final boolean withNetwork) {
 		this.busProtocol = FXCollections.observableArrayList();
 		this.airsupplier = new AirSupplier(this);
 		try {
-			this.root = new CodeReader(0x7F, this);
-		} catch (final IdAlreadyExistsException e) {
-			throw new Error();
+			this.root = new CodeReader(0x7F, this, 5);
+		} catch (final IdAlreadyExistsException | NoAttachmentException | TreeIntegrityException | SpaceOccupiedException e) {
+			throw new Error(e);
 		}
 		this.getRoot().create33c3();
 
-		if (withNetwork) {
+		try {
 			this.sssc = new SssConnection(this, "/dev/ttyUSB0");
-		} else {
-			this.sssc = null;
+		} catch (final UnsatisfiedLinkError e) {
+			System.err.println("Could not connect bus! " + e.getMessage());
 		}
 
 		this.t = new Thread(this, "NetworkWorker");
@@ -204,18 +207,16 @@ synchronized public void stop() {
 	 * @param message
 	 *            the message to send
 	 */
-	public void send(final byte[] message) {
+	public void send(Message message) {
 		if (this.sssc != null)
-			this.sssc.send(message);
-		this.saveBusToList(message, false);
+			this.sssc.send(message.getPayload());
+		this.saveBusToList(message);
 
 	}
 
-	public void saveBusToList(final byte[] message, final boolean incoming) {
-		if (message.length != 16)
-			return;
+	public void saveBusToList(Message message) {
 		Platform.runLater(() -> {
-			this.getBusProtocolHistory().add(new Message(message, incoming));
+			this.getBusProtocolHistory().add(message);
 		});
 	}
 
@@ -230,63 +231,4 @@ public Map<Integer, NetworkComponent> getIdMap() {
 	public ObservableList<Message> getBusProtocolHistory() {
 		return this.busProtocol;
 	}
-
-	public class Message {
-		private final byte[] message;
-		private final boolean incoming;
-
-		private Message(final byte[] message, final boolean incoming) {
-			this.message = message;
-			this.incoming = incoming;
-		}
-
-		@Override
-		public String toString() {
-			String s = "";
-			if (this.incoming) {
-				s = s + "INC: ";
-			} else {
-				s = s + "OUT: ";
-			}
-			switch (this.message[0]) {
-			case 0:
-				s = s + "Detect at " + this.message[1];
-				break;
-			case 1:
-				s = s + "Connect " + this.message[2] + " to " + this.message[3];
-				break;
-			case 2:
-				s = s + "Connected " + this.message[1] + " to " + this.message[3];
-				break;
-			case 3:
-				s = s + "Request Route " + this.message[1] + " to " + this.message[3];
-				break;
-			case 4:
-				break;
-			case 5:
-				s = s + "ACK Route " + this.message[1] + " to " + this.message[3];
-				break;
-			case 6:
-				s = s + "Route " + this.message[1] + " to " + this.message[3] + "started";
-				break;
-			case 7:
-				s = s + "Barcode " + this.message[3] + " read";
-				break;
-			case 8:
-				switch (this.message[3]) {
-				case 0:
-					s = s + "Airflow stopped";
-					break;
-				case 1:
-					s = s + "Airflow Pull started";
-					break;
-				case 2:
-					s = s + "Airflow Push started";
-					break;
-				}
-				break;
-			}
-			return s;
-		}
-	}
 }
diff --git a/src/de/c3seidenstrasse/networkcontroller/route/Transport.java b/src/de/c3seidenstrasse/networkcontroller/route/Transport.java
index 7e389e9..57053f3 100644
--- a/src/de/c3seidenstrasse/networkcontroller/route/Transport.java
+++ b/src/de/c3seidenstrasse/networkcontroller/route/Transport.java
@@ -4,7 +4,7 @@
 import java.util.HashSet;
 import java.util.LinkedList;
 
-import de.c3seidenstrasse.networkcontroller.network.IndexedNetworkComponent;
+import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
 import de.c3seidenstrasse.networkcontroller.network.NetworkComponent;
 import de.c3seidenstrasse.networkcontroller.utils.NotFoundException;
 import de.c3seidenstrasse.networkcontroller.utils.RouteNotFoundException;
@@ -16,16 +16,16 @@ public class Transport {
 	private final NetworkComponent start;
 	private final NetworkComponent ende;
 	private final NetworkComponent highestPoint;
-	private final LinkedList<IndexedNetworkComponent> up;
-	private final LinkedList<IndexedNetworkComponent> down;
-	private final HashSet<IndexedNetworkComponent> airflow;
+	private final LinkedList<NetworkComponent> up;
+	private final LinkedList<NetworkComponent> down;
+	private final LinkedList<NetworkComponent> airflow;
 
 	public Transport(final NetworkComponent start, final NetworkComponent ende) throws RouteNotFoundException {
 		this.transportid = Transport.LASTTRANSPORTID++;
 
 		this.up = new LinkedList<>();
 		this.down = new LinkedList<>();
-		this.airflow = new HashSet<>();
+		this.airflow = new LinkedList<>();
 
 		if (!start.getNetwork().equals(ende.getNetwork())) {
 			throw new IllegalArgumentException();
@@ -49,7 +49,7 @@ public Transport(final NetworkComponent start, final NetworkComponent ende) thro
 
 	@Override
 	public String toString() {
-		return "Transport #" + this.transportid;
+		return "Transport #" + this.transportid + visualRoute();
 	}
 
 	public String visualRoute() {
@@ -57,29 +57,29 @@ public String visualRoute() {
 				+ ",\nup=" + this.up + ",\ndown=" + this.down + ",\nairflow=" + this.airflow + "]";
 	}
 
-	public void addUp(final IndexedNetworkComponent inc) {
+	public void addUp(final NetworkComponent inc) {
 		this.getUp().add(inc);
 	}
 
-	public void addDown(final IndexedNetworkComponent inc) {
+	public void addDown(final NetworkComponent inc) {
 		this.getDown().add(inc);
 	}
 
-	public LinkedList<IndexedNetworkComponent> getTransportWaypoints() {
-		final LinkedList<IndexedNetworkComponent> l = new LinkedList<>(this.getUp());
+	public LinkedList<NetworkComponent> getTransportWaypoints() {
+		final LinkedList<NetworkComponent> l = new LinkedList<>(this.getUp());
 		l.addAll(this.getDown());
 		return l;
 	}
 
 	public NetworkComponent getLastUp() {
-		return this.getUp().getLast().getNc();
+		return this.getUp().getLast();
 	}
 
-	public LinkedList<IndexedNetworkComponent> getUp() {
+	public LinkedList<NetworkComponent> getUp() {
 		return this.up;
 	}
 
-	public LinkedList<IndexedNetworkComponent> getDown() {
+	public LinkedList<NetworkComponent> getDown() {
 		return this.down;
 	}
 
@@ -95,7 +95,7 @@ public NetworkComponent getHighestPoint() {
 		return this.highestPoint;
 	}
 
-	public HashSet<IndexedNetworkComponent> getAirflow() {
+	public LinkedList<NetworkComponent> getAirflow() {
 		return this.airflow;
 	}
 
diff --git a/src/de/c3seidenstrasse/networkcontroller/utils/networkmap.png b/src/de/c3seidenstrasse/networkcontroller/utils/networkmap.png
index bc675cd..6e67867 100644
Binary files a/src/de/c3seidenstrasse/networkcontroller/utils/networkmap.png and b/src/de/c3seidenstrasse/networkcontroller/utils/networkmap.png differ