Netlist and switches from TG14, so far.

4 files changed, 415 insertions, 261 deletions

diff --git a/netlist.txt b/netlist.txt
index 9ff4abd..3d0a3df 100644
--- a/netlist.txt
+++ b/netlist.txt
@@ -2,9 +2,151 @@
 151.216.224.0 24 logistikk
 151.216.227.0 25 fugleberget1
 151.216.227.128 25 fugleberget2
+151.216.229.0 24 gayme
 151.216.234.0 24 clientcam
+151.216.235.0 24 highlights
+151.216.244.0 26 apenett01
+151.216.244.64 26 apenett02
+151.216.244.128 26 apenett03
+151.216.244.192 26 apenett04
+151.216.245.0 26 apenett05
+151.216.245.64 26 rohypnol
 151.216.252.0 24 noc
-# --> Denne er det ikke meningen å rulle ut: 151.216.125.0 24 noc-server
+151.216.253.0 24 noc-server
 151.216.254.0 24 tele
 # Start av switches.txt fra planning.cpp
+151.216.129.0 26 e1-3
+151.216.129.64 26 e1-4
+151.216.129.128 26 e3-3
+151.216.129.192 26 e3-4
+151.216.130.0 26 e5-3
+151.216.130.64 26 e5-4
+151.216.130.128 26 e7-3
+151.216.130.192 26 e7-4
+151.216.131.0 26 e9-3
+151.216.131.64 26 e9-4
+151.216.131.128 26 e11-1
+151.216.131.192 26 e11-2
+151.216.132.0 26 e11-3
+151.216.132.64 26 e11-4
+151.216.132.128 26 e13-1
+151.216.132.192 26 e13-2
+151.216.133.0 26 e13-3
+151.216.133.64 26 e13-4
+151.216.133.128 26 e15-1
+151.216.133.192 26 e15-2
+151.216.134.0 26 e15-3
+151.216.134.64 26 e15-4
+151.216.134.128 26 e17-1
+151.216.134.192 26 e17-2
+151.216.135.0 26 e17-3
+151.216.135.64 26 e17-4
+151.216.135.128 26 e19-1
+151.216.135.192 26 e19-2
+151.216.136.0 26 e19-3
+151.216.136.64 26 e19-4
+151.216.136.128 26 e21-1
+151.216.136.192 26 e21-2
+151.216.137.0 26 e21-3
+151.216.137.64 26 e21-4
+151.216.137.128 26 e23-1
+151.216.137.192 26 e23-2
+151.216.138.0 26 e23-3
+151.216.138.64 26 e23-4
+151.216.138.128 26 e25-1
+151.216.138.192 26 e25-2
+151.216.139.0 26 e25-3
+151.216.139.64 26 e25-4
+151.216.139.128 26 e27-1
+151.216.139.192 26 e27-2
+151.216.140.0 26 e29-1
+151.216.140.64 26 e29-2
+151.216.140.128 26 e31-1
+151.216.140.192 26 e31-2
+151.216.141.0 26 e33-1
+151.216.141.64 26 e33-2
+151.216.141.128 26 e35-1
+151.216.141.192 26 e35-2
+151.216.142.0 26 e37-1
+151.216.142.64 26 e37-2
+151.216.142.128 26 e39-1
+151.216.142.192 26 e39-2
+151.216.143.0 26 e41-1
+151.216.143.64 26 e41-2
+151.216.143.128 26 e43-1
+151.216.143.192 26 e43-2
+151.216.144.0 26 e43-3
+151.216.144.64 26 e43-4
+151.216.144.128 26 e45-1
+151.216.144.192 26 e45-2
+151.216.145.0 26 e45-3
+151.216.145.64 26 e45-4
+151.216.145.128 26 e47-1
+151.216.145.192 26 e47-2
+151.216.146.0 26 e47-3
+151.216.146.64 26 e47-4
+151.216.146.128 26 e49-1
+151.216.146.192 26 e49-2
+151.216.147.0 26 e49-3
+151.216.147.64 26 e49-4
+151.216.147.128 26 e51-1
+151.216.147.192 26 e51-2
+151.216.148.0 26 e51-3
+151.216.148.64 26 e51-4
+151.216.148.128 26 e53-1
+151.216.148.192 26 e53-2
+151.216.149.0 26 e53-3
+151.216.149.64 26 e53-4
+151.216.149.128 26 e55-1
+151.216.149.192 26 e55-2
+151.216.150.0 26 e55-3
+151.216.150.64 26 e55-4
+151.216.150.128 26 e57-1
+151.216.150.192 26 e57-2
+151.216.151.0 26 e57-3
+151.216.151.64 26 e57-4
+151.216.151.128 26 e59-1
+151.216.151.192 26 e59-2
+151.216.152.0 26 e59-3
+151.216.152.64 26 e59-4
+151.216.152.128 26 e61-1
+151.216.152.192 26 e61-2
+151.216.153.0 26 e61-3
+151.216.153.64 26 e61-4
+151.216.153.128 26 e63-1
+151.216.153.192 26 e63-2
+151.216.154.0 26 e63-3
+151.216.154.64 26 e63-4
+151.216.154.128 26 e65-1
+151.216.154.192 26 e65-2
+151.216.155.0 26 e65-3
+151.216.155.64 26 e65-4
+151.216.155.128 26 e67-1
+151.216.155.192 26 e67-2
+151.216.156.0 26 e67-3
+151.216.156.64 26 e67-4
+151.216.156.128 26 e69-1
+151.216.156.192 26 e69-2
+151.216.157.0 26 e69-3
+151.216.157.64 26 e69-4
+151.216.157.128 26 e71-1
+151.216.157.192 26 e71-2
+151.216.158.0 26 e71-3
+151.216.158.64 26 e71-4
+151.216.158.128 26 e73-1
+151.216.158.192 26 e73-2
+151.216.159.0 26 e73-3
+151.216.159.64 26 e73-4
+151.216.159.128 26 e75-1
+151.216.159.192 26 e75-2
+151.216.160.0 26 e75-3
+151.216.160.64 26 e75-4
+151.216.160.128 26 e77-1
+151.216.160.192 26 e77-2
+151.216.161.0 26 e77-3
+151.216.161.64 26 e77-4
+151.216.161.128 26 e79-1
+151.216.161.192 26 e79-2
+151.216.162.0 26 e81-1
+151.216.162.64 26 e81-2
 # Slutt av switches.txt fra planning.cpp
diff --git a/patchlist.txt b/patchlist.txt
index 30285d5..bc8f65c 100644
--- a/patchlist.txt
+++ b/patchlist.txt
@@ -8,121 +8,127 @@ e7-3 distro1 Gi1/7 Gi2/7 Gi5/7 Gi6/7
 e7-4 distro1 Gi1/8 Gi2/8 Gi5/8 Gi6/8
 e9-3 distro1 Gi1/9 Gi2/9 Gi5/9 Gi6/9
 e9-4 distro1 Gi1/10 Gi2/10 Gi5/10 Gi6/10
-e11-1 distro2 Gi1/1 Gi2/1 Gi5/1 Gi6/1
-e11-2 distro2 Gi1/2 Gi2/2 Gi5/2 Gi6/2
-e11-3 distro1 Gi1/11 Gi2/11 Gi5/11 Gi6/11
-e11-4 distro1 Gi1/12 Gi2/12 Gi5/12 Gi6/12
-e13-1 distro2 Gi1/3 Gi2/3 Gi5/3 Gi6/3
-e13-2 distro2 Gi1/4 Gi2/4 Gi5/4 Gi6/4
-e13-3 distro1 Gi1/13 Gi2/13 Gi5/13 Gi6/13
-e13-4 distro1 Gi1/14 Gi2/14 Gi5/14 Gi6/14
-e15-1 distro2 Gi1/5 Gi2/5 Gi5/5 Gi6/5
-e15-2 distro2 Gi1/6 Gi2/6 Gi5/6 Gi6/6
-e15-3 distro1 Gi1/15 Gi2/15 Gi5/15 Gi6/15
-e15-4 distro1 Gi1/16 Gi2/16 Gi5/16 Gi6/16
-e17-1 distro2 Gi1/7 Gi2/7 Gi5/7 Gi6/7
-e17-2 distro2 Gi1/8 Gi2/8 Gi5/8 Gi6/8
-e17-3 distro1 Gi1/17 Gi2/17 Gi5/17 Gi6/17
-e17-4 distro1 Gi1/18 Gi2/18 Gi5/18 Gi6/18
-e19-1 distro2 Gi1/9 Gi2/9 Gi5/9 Gi6/9
-e19-2 distro2 Gi1/10 Gi2/10 Gi5/10 Gi6/10
-e19-3 distro1 Gi1/19 Gi2/19 Gi5/19 Gi6/19
-e19-4 distro1 Gi1/20 Gi2/20 Gi5/20 Gi6/20
-e21-1 distro2 Gi1/11 Gi2/11 Gi5/11 Gi6/11
-e21-2 distro2 Gi1/12 Gi2/12 Gi5/12 Gi6/12
-e21-3 distro1 Gi1/21 Gi2/21 Gi5/21 Gi6/21
-e21-4 distro1 Gi1/22 Gi2/22 Gi5/22 Gi6/22
-e23-1 distro2 Gi1/13 Gi2/13 Gi5/13 Gi6/13
-e23-2 distro2 Gi1/14 Gi2/14 Gi5/14 Gi6/14
-e23-3 distro1 Gi1/23 Gi2/23 Gi5/23 Gi6/23
-e23-4 distro1 Gi1/24 Gi2/24 Gi5/24 Gi6/24
-e25-1 distro2 Gi1/15 Gi2/15 Gi5/15 Gi6/15
-e25-2 distro2 Gi1/16 Gi2/16 Gi5/16 Gi6/16
-e25-3 distro1 Gi1/25 Gi2/25 Gi5/25 Gi6/25
-e25-4 distro1 Gi1/26 Gi2/26 Gi5/26 Gi6/26
-e27-1 distro2 Gi1/17 Gi2/17 Gi5/17 Gi6/17
-e27-2 distro2 Gi1/18 Gi2/18 Gi5/18 Gi6/18
-e29-1 distro2 Gi1/19 Gi2/19 Gi5/19 Gi6/19
-e29-2 distro2 Gi1/20 Gi2/20 Gi5/20 Gi6/20
-e31-1 distro2 Gi1/21 Gi2/21 Gi5/21 Gi6/21
-e31-2 distro2 Gi1/22 Gi2/22 Gi5/22 Gi6/22
-e33-1 distro3 Gi1/1 Gi2/1 Gi5/1 Gi6/1
-e33-2 distro2 Gi1/23 Gi2/23 Gi5/23 Gi6/23
-e35-1 distro3 Gi1/2 Gi2/2 Gi5/2 Gi6/2
-e35-2 distro3 Gi1/3 Gi2/3 Gi5/3 Gi6/3
-e37-1 distro3 Gi1/4 Gi2/4 Gi5/4 Gi6/4
-e37-2 distro3 Gi1/5 Gi2/5 Gi5/5 Gi6/5
-e39-1 distro3 Gi1/6 Gi2/6 Gi5/6 Gi6/6
-e39-2 distro3 Gi1/7 Gi2/7 Gi5/7 Gi6/7
-e41-1 distro3 Gi1/8 Gi2/8 Gi5/8 Gi6/8
-e41-2 distro3 Gi1/9 Gi2/9 Gi5/9 Gi6/9
-e43-1 distro3 Gi1/10 Gi2/10 Gi5/10 Gi6/10
-e43-2 distro3 Gi1/11 Gi2/11 Gi5/11 Gi6/11
-e43-3 distro4 Gi1/1 Gi2/1 Gi5/1 Gi6/1
-e43-4 distro4 Gi1/2 Gi2/2 Gi5/2 Gi6/2
-e45-1 distro3 Gi1/12 Gi2/12 Gi5/12 Gi6/12
-e45-2 distro3 Gi1/13 Gi2/13 Gi5/13 Gi6/13
-e45-3 distro4 Gi1/3 Gi2/3 Gi5/3 Gi6/3
-e45-4 distro4 Gi1/4 Gi2/4 Gi5/4 Gi6/4
-e47-1 distro3 Gi1/14 Gi2/14 Gi5/14 Gi6/14
-e47-2 distro3 Gi1/15 Gi2/15 Gi5/15 Gi6/15
-e47-3 distro4 Gi1/5 Gi2/5 Gi5/5 Gi6/5
-e47-4 distro4 Gi1/6 Gi2/6 Gi5/6 Gi6/6
-e49-1 distro3 Gi1/16 Gi2/16 Gi5/16 Gi6/16
-e49-2 distro3 Gi1/17 Gi2/17 Gi5/17 Gi6/17
-e49-3 distro4 Gi1/7 Gi2/7 Gi5/7 Gi6/7
-e49-4 distro4 Gi1/8 Gi2/8 Gi5/8 Gi6/8
-e51-1 distro3 Gi1/18 Gi2/18 Gi5/18 Gi6/18
-e51-2 distro3 Gi1/19 Gi2/19 Gi5/19 Gi6/19
-e51-3 distro4 Gi1/9 Gi2/9 Gi5/9 Gi6/9
-e51-4 distro4 Gi1/10 Gi2/10 Gi5/10 Gi6/10
-e53-1 distro3 Gi1/20 Gi2/20 Gi5/20 Gi6/20
-e53-2 distro3 Gi1/21 Gi2/21 Gi5/21 Gi6/21
-e53-3 distro4 Gi1/11 Gi2/11 Gi5/11 Gi6/11
-e53-4 distro4 Gi1/12 Gi2/12 Gi5/12 Gi6/12
-e55-1 distro3 Gi1/22 Gi2/22 Gi5/22 Gi6/22
-e55-2 distro3 Gi1/23 Gi2/23 Gi5/23 Gi6/23
-e55-3 distro4 Gi1/13 Gi2/13 Gi5/13 Gi6/13
-e55-4 distro4 Gi1/14 Gi2/14 Gi5/14 Gi6/14
-e57-1 distro3 Gi1/24 Gi2/24 Gi5/24 Gi6/24
-e57-2 distro3 Gi1/25 Gi2/25 Gi5/25 Gi6/25
-e57-3 distro4 Gi1/15 Gi2/15 Gi5/15 Gi6/15
-e57-4 distro4 Gi1/16 Gi2/16 Gi5/16 Gi6/16
-e59-1 distro5 Gi1/1 Gi2/1 Gi5/1 Gi6/1
-e59-2 distro5 Gi1/2 Gi2/2 Gi5/2 Gi6/2
-e59-3 distro4 Gi1/17 Gi2/17 Gi5/17 Gi6/17
-e59-4 distro4 Gi1/18 Gi2/18 Gi5/18 Gi6/18
-e61-1 distro5 Gi1/3 Gi2/3 Gi5/3 Gi6/3
-e61-2 distro5 Gi1/4 Gi2/4 Gi5/4 Gi6/4
-e61-3 distro4 Gi1/19 Gi2/19 Gi5/19 Gi6/19
-e61-4 distro4 Gi1/20 Gi2/20 Gi5/20 Gi6/20
-e63-1 distro5 Gi1/5 Gi2/5 Gi5/5 Gi6/5
-e63-2 distro5 Gi1/6 Gi2/6 Gi5/6 Gi6/6
-e63-3 distro5 Gi1/7 Gi2/7 Gi5/7 Gi6/7
-e63-4 distro5 Gi1/8 Gi2/8 Gi5/8 Gi6/8
-e65-1 distro5 Gi1/9 Gi2/9 Gi5/9 Gi6/9
-e65-2 distro5 Gi1/10 Gi2/10 Gi5/10 Gi6/10
-e65-3 distro5 Gi1/11 Gi2/11 Gi5/11 Gi6/11
-e65-4 distro5 Gi1/12 Gi2/12 Gi5/12 Gi6/12
-e67-1 distro5 Gi1/13 Gi2/13 Gi5/13 Gi6/13
-e67-2 distro5 Gi1/14 Gi2/14 Gi5/14 Gi6/14
-e67-3 distro5 Gi1/15 Gi2/15 Gi5/15 Gi6/15
-e67-4 distro5 Gi1/16 Gi2/16 Gi5/16 Gi6/16
-e69-1 distro5 Gi1/17 Gi2/17 Gi5/17 Gi6/17
-e69-2 distro5 Gi1/18 Gi2/18 Gi5/18 Gi6/18
-e69-3 distro5 Gi1/19 Gi2/19 Gi5/19 Gi6/19
-e69-4 distro5 Gi1/20 Gi2/20 Gi5/20 Gi6/20
-e71-1 distro5 Gi1/21 Gi2/21 Gi5/21 Gi6/21
-e71-2 distro5 Gi1/22 Gi2/22 Gi5/22 Gi6/22
-e71-3 distro5 Gi1/23 Gi2/23 Gi5/23 Gi6/23
-e71-4 distro5 Gi1/24 Gi2/24 Gi5/24 Gi6/24
-e73-1 distro5 Gi1/25 Gi2/25 Gi5/25 Gi6/25
-e73-2 distro5 Gi1/26 Gi2/26 Gi5/26 Gi6/26
-e73-3 distro5 Gi1/27 Gi2/27 Gi5/27 Gi6/27
-e73-4 distro5 Gi1/28 Gi2/28 Gi5/28 Gi6/28
-e75-1 distro5 Gi1/29 Gi2/29 Gi5/29 Gi6/29
-e75-2 distro5 Gi1/30 Gi2/30 Gi5/30 Gi6/30
-e75-3 distro5 Gi1/31 Gi2/31 Gi5/31 Gi6/31
-e75-4 distro5 Gi1/32 Gi2/32 Gi5/32 Gi6/32
-e77-1 distro5 Gi1/33 Gi2/33 Gi5/33 Gi6/33
-e77-2 distro5 Gi1/34 Gi2/34 Gi5/34 Gi6/34
+e11-1 distro3 Gi1/1 Gi2/1 Gi5/1 Gi6/1
+e11-2 distro3 Gi1/2 Gi2/2 Gi5/2 Gi6/2
+e11-3 distro2 Gi1/1 Gi2/1 Gi5/1 Gi6/1
+e11-4 distro2 Gi1/2 Gi2/2 Gi5/2 Gi6/2
+e13-1 distro3 Gi1/3 Gi2/3 Gi5/3 Gi6/3
+e13-2 distro3 Gi1/4 Gi2/4 Gi5/4 Gi6/4
+e13-3 distro2 Gi1/3 Gi2/3 Gi5/3 Gi6/3
+e13-4 distro2 Gi1/4 Gi2/4 Gi5/4 Gi6/4
+e15-1 distro3 Gi1/5 Gi2/5 Gi5/5 Gi6/5
+e15-2 distro3 Gi1/6 Gi2/6 Gi5/6 Gi6/6
+e15-3 distro2 Gi1/5 Gi2/5 Gi5/5 Gi6/5
+e15-4 distro2 Gi1/6 Gi2/6 Gi5/6 Gi6/6
+e17-1 distro3 Gi1/7 Gi2/7 Gi5/7 Gi6/7
+e17-2 distro3 Gi1/8 Gi2/8 Gi5/8 Gi6/8
+e17-3 distro2 Gi1/7 Gi2/7 Gi5/7 Gi6/7
+e17-4 distro2 Gi1/8 Gi2/8 Gi5/8 Gi6/8
+e19-1 distro3 Gi1/9 Gi2/9 Gi5/9 Gi6/9
+e19-2 distro3 Gi1/10 Gi2/10 Gi5/10 Gi6/10
+e19-3 distro2 Gi1/9 Gi2/9 Gi5/9 Gi6/9
+e19-4 distro2 Gi1/10 Gi2/10 Gi5/10 Gi6/10
+e21-1 distro3 Gi1/11 Gi2/11 Gi5/11 Gi6/11
+e21-2 distro3 Gi1/12 Gi2/12 Gi5/12 Gi6/12
+e21-3 distro2 Gi1/11 Gi2/11 Gi5/11 Gi6/11
+e21-4 distro2 Gi1/12 Gi2/12 Gi5/12 Gi6/12
+e23-1 distro3 Gi1/13 Gi2/13 Gi5/13 Gi6/13
+e23-2 distro3 Gi1/14 Gi2/14 Gi5/14 Gi6/14
+e23-3 distro2 Gi1/13 Gi2/13 Gi5/13 Gi6/13
+e23-4 distro2 Gi1/14 Gi2/14 Gi5/14 Gi6/14
+e25-1 distro3 Gi1/15 Gi2/15 Gi5/15 Gi6/15
+e25-2 distro3 Gi1/16 Gi2/16 Gi5/16 Gi6/16
+e25-3 distro2 Gi1/15 Gi2/15 Gi5/15 Gi6/15
+e25-4 distro2 Gi1/16 Gi2/16 Gi5/16 Gi6/16
+e27-1 distro3 Gi1/17 Gi2/17 Gi5/17 Gi6/17
+e27-2 distro3 Gi1/18 Gi2/18 Gi5/18 Gi6/18
+e29-1 distro3 Gi1/19 Gi2/19 Gi5/19 Gi6/19
+e29-2 distro3 Gi1/20 Gi2/20 Gi5/20 Gi6/20
+e31-1 distro3 Gi1/21 Gi2/21 Gi5/21 Gi6/21
+e31-2 distro3 Gi1/22 Gi2/22 Gi5/22 Gi6/22
+e33-1 distro3 Gi1/23 Gi2/23 Gi5/23 Gi6/23
+e33-2 distro3 Gi1/24 Gi2/24 Gi5/24 Gi6/24
+e35-1 distro4 Gi1/1 Gi2/1 Gi5/1 Gi6/1
+e35-2 distro4 Gi1/2 Gi2/2 Gi5/2 Gi6/2
+e37-1 distro4 Gi1/3 Gi2/3 Gi5/3 Gi6/3
+e37-2 distro4 Gi1/4 Gi2/4 Gi5/4 Gi6/4
+e39-1 distro4 Gi1/5 Gi2/5 Gi5/5 Gi6/5
+e39-2 distro4 Gi1/6 Gi2/6 Gi5/6 Gi6/6
+e41-1 distro4 Gi1/7 Gi2/7 Gi5/7 Gi6/7
+e41-2 distro4 Gi1/8 Gi2/8 Gi5/8 Gi6/8
+e43-1 distro4 Gi1/9 Gi2/9 Gi5/9 Gi6/9
+e43-2 distro4 Gi1/10 Gi2/10 Gi5/10 Gi6/10
+e43-3 distro5 Gi1/1 Gi2/1 Gi5/1 Gi6/1
+e43-4 distro5 Gi1/2 Gi2/2 Gi5/2 Gi6/2
+e45-1 distro4 Gi1/11 Gi2/11 Gi5/11 Gi6/11
+e45-2 distro4 Gi1/12 Gi2/12 Gi5/12 Gi6/12
+e45-3 distro5 Gi1/3 Gi2/3 Gi5/3 Gi6/3
+e45-4 distro5 Gi1/4 Gi2/4 Gi5/4 Gi6/4
+e47-1 distro4 Gi1/13 Gi2/13 Gi5/13 Gi6/13
+e47-2 distro4 Gi1/14 Gi2/14 Gi5/14 Gi6/14
+e47-3 distro5 Gi1/5 Gi2/5 Gi5/5 Gi6/5
+e47-4 distro5 Gi1/6 Gi2/6 Gi5/6 Gi6/6
+e49-1 distro4 Gi1/15 Gi2/15 Gi5/15 Gi6/15
+e49-2 distro4 Gi1/16 Gi2/16 Gi5/16 Gi6/16
+e49-3 distro5 Gi1/7 Gi2/7 Gi5/7 Gi6/7
+e49-4 distro5 Gi1/8 Gi2/8 Gi5/8 Gi6/8
+e51-1 distro4 Gi1/17 Gi2/17 Gi5/17 Gi6/17
+e51-2 distro4 Gi1/18 Gi2/18 Gi5/18 Gi6/18
+e51-3 distro5 Gi1/9 Gi2/9 Gi5/9 Gi6/9
+e51-4 distro5 Gi1/10 Gi2/10 Gi5/10 Gi6/10
+e53-1 distro4 Gi1/19 Gi2/19 Gi5/19 Gi6/19
+e53-2 distro4 Gi1/20 Gi2/20 Gi5/20 Gi6/20
+e53-3 distro5 Gi1/11 Gi2/11 Gi5/11 Gi6/11
+e53-4 distro5 Gi1/12 Gi2/12 Gi5/12 Gi6/12
+e55-1 distro4 Gi1/21 Gi2/21 Gi5/21 Gi6/21
+e55-2 distro4 Gi1/22 Gi2/22 Gi5/22 Gi6/22
+e55-3 distro5 Gi1/13 Gi2/13 Gi5/13 Gi6/13
+e55-4 distro5 Gi1/14 Gi2/14 Gi5/14 Gi6/14
+e57-1 distro4 Gi1/23 Gi2/23 Gi5/23 Gi6/23
+e57-2 distro4 Gi1/24 Gi2/24 Gi5/24 Gi6/24
+e57-3 distro5 Gi1/15 Gi2/15 Gi5/15 Gi6/15
+e57-4 distro5 Gi1/16 Gi2/16 Gi5/16 Gi6/16
+e59-1 distro6 Gi1/1 Gi2/1 Gi5/1 Gi6/1
+e59-2 distro4 Gi1/25 Gi2/25 Gi5/25 Gi6/25
+e59-3 distro5 Gi1/17 Gi2/17 Gi5/17 Gi6/17
+e59-4 distro5 Gi1/18 Gi2/18 Gi5/18 Gi6/18
+e61-1 distro6 Gi1/2 Gi2/2 Gi5/2 Gi6/2
+e61-2 distro6 Gi1/3 Gi2/3 Gi5/3 Gi6/3
+e61-3 distro5 Gi1/19 Gi2/19 Gi5/19 Gi6/19
+e61-4 distro5 Gi1/20 Gi2/20 Gi5/20 Gi6/20
+e63-1 distro6 Gi1/4 Gi2/4 Gi5/4 Gi6/4
+e63-2 distro6 Gi1/5 Gi2/5 Gi5/5 Gi6/5
+e63-3 distro6 Gi1/6 Gi2/6 Gi5/6 Gi6/6
+e63-4 distro5 Gi1/21 Gi2/21 Gi5/21 Gi6/21
+e65-1 distro6 Gi1/7 Gi2/7 Gi5/7 Gi6/7
+e65-2 distro6 Gi1/8 Gi2/8 Gi5/8 Gi6/8
+e65-3 distro6 Gi1/9 Gi2/9 Gi5/9 Gi6/9
+e65-4 distro6 Gi1/10 Gi2/10 Gi5/10 Gi6/10
+e67-1 distro6 Gi1/11 Gi2/11 Gi5/11 Gi6/11
+e67-2 distro6 Gi1/12 Gi2/12 Gi5/12 Gi6/12
+e67-3 distro6 Gi1/13 Gi2/13 Gi5/13 Gi6/13
+e67-4 distro6 Gi1/14 Gi2/14 Gi5/14 Gi6/14
+e69-1 distro6 Gi1/15 Gi2/15 Gi5/15 Gi6/15
+e69-2 distro6 Gi1/16 Gi2/16 Gi5/16 Gi6/16
+e69-3 distro6 Gi1/17 Gi2/17 Gi5/17 Gi6/17
+e69-4 distro6 Gi1/18 Gi2/18 Gi5/18 Gi6/18
+e71-1 distro6 Gi1/19 Gi2/19 Gi5/19 Gi6/19
+e71-2 distro6 Gi1/20 Gi2/20 Gi5/20 Gi6/20
+e71-3 distro6 Gi1/21 Gi2/21 Gi5/21 Gi6/21
+e71-4 distro6 Gi1/22 Gi2/22 Gi5/22 Gi6/22
+e73-1 distro6 Gi1/23 Gi2/23 Gi5/23 Gi6/23
+e73-2 distro6 Gi1/24 Gi2/24 Gi5/24 Gi6/24
+e73-3 distro6 Gi1/25 Gi2/25 Gi5/25 Gi6/25
+e73-4 distro6 Gi1/26 Gi2/26 Gi5/26 Gi6/26
+e75-1 distro6 Gi1/27 Gi2/27 Gi5/27 Gi6/27
+e75-2 distro6 Gi1/28 Gi2/28 Gi5/28 Gi6/28
+e75-3 distro6 Gi1/29 Gi2/29 Gi5/29 Gi6/29
+e75-4 distro6 Gi1/30 Gi2/30 Gi5/30 Gi6/30
+e77-1 distro6 Gi1/31 Gi2/31 Gi5/31 Gi6/31
+e77-2 distro6 Gi1/32 Gi2/32 Gi5/32 Gi6/32
+e77-3 distro6 Gi1/33 Gi2/33 Gi5/33 Gi6/33
+e77-4 distro6 Gi1/34 Gi2/34 Gi5/34 Gi6/34
+e79-1 distro6 Gi1/35 Gi2/35 Gi5/35 Gi6/35
+e79-2 distro6 Gi1/36 Gi2/36 Gi5/36 Gi6/36
+e81-1 distro6 Gi1/37 Gi2/37 Gi5/37 Gi6/37
+e81-2 distro6 Gi1/38 Gi2/38 Gi5/38 Gi6/38
diff --git a/switches.txt b/switches.txt
index efd8454..ee32f16 100644
--- a/switches.txt
+++ b/switches.txt
@@ -1,128 +1,134 @@
-151.216.1.0 26 e1-3 x.x.x.x
-151.216.1.64 26 e1-4 x.x.x.x
-151.216.1.128 26 e3-3 x.x.x.x
-151.216.1.192 26 e3-4 x.x.x.x
-151.216.2.0 26 e5-3 x.x.x.x
-151.216.2.64 26 e5-4 x.x.x.x
-151.216.2.128 26 e7-3 x.x.x.x
-151.216.2.192 26 e7-4 x.x.x.x
-151.216.3.0 26 e9-3 x.x.x.x
-151.216.3.64 26 e9-4 x.x.x.x
-151.216.3.128 26 e11-1 x.x.x.x
-151.216.3.192 26 e11-2 x.x.x.x
-151.216.4.0 26 e11-3 x.x.x.x
-151.216.4.64 26 e11-4 x.x.x.x
-151.216.4.128 26 e13-1 x.x.x.x
-151.216.4.192 26 e13-2 x.x.x.x
-151.216.5.0 26 e13-3 x.x.x.x
-151.216.5.64 26 e13-4 x.x.x.x
-151.216.5.128 26 e15-1 x.x.x.x
-151.216.5.192 26 e15-2 x.x.x.x
-151.216.6.0 26 e15-3 x.x.x.x
-151.216.6.64 26 e15-4 x.x.x.x
-151.216.6.128 26 e17-1 x.x.x.x
-151.216.6.192 26 e17-2 x.x.x.x
-151.216.7.0 26 e17-3 x.x.x.x
-151.216.7.64 26 e17-4 x.x.x.x
-151.216.7.128 26 e19-1 x.x.x.x
-151.216.7.192 26 e19-2 x.x.x.x
-151.216.8.0 26 e19-3 x.x.x.x
-151.216.8.64 26 e19-4 x.x.x.x
-151.216.8.128 26 e21-1 x.x.x.x
-151.216.8.192 26 e21-2 x.x.x.x
-151.216.9.0 26 e21-3 x.x.x.x
-151.216.9.64 26 e21-4 x.x.x.x
-151.216.9.128 26 e23-1 x.x.x.x
-151.216.9.192 26 e23-2 x.x.x.x
-151.216.10.0 26 e23-3 x.x.x.x
-151.216.10.64 26 e23-4 x.x.x.x
-151.216.10.128 26 e25-1 x.x.x.x
-151.216.10.192 26 e25-2 x.x.x.x
-151.216.11.0 26 e25-3 x.x.x.x
-151.216.11.64 26 e25-4 x.x.x.x
-151.216.11.128 26 e27-1 x.x.x.x
-151.216.11.192 26 e27-2 x.x.x.x
-151.216.12.0 26 e29-1 x.x.x.x
-151.216.12.64 26 e29-2 x.x.x.x
-151.216.12.128 26 e31-1 x.x.x.x
-151.216.12.192 26 e31-2 x.x.x.x
-151.216.13.0 26 e33-1 x.x.x.x
-151.216.13.64 26 e33-2 x.x.x.x
-151.216.13.128 26 e35-1 x.x.x.x
-151.216.13.192 26 e35-2 x.x.x.x
-151.216.14.0 26 e37-1 x.x.x.x
-151.216.14.64 26 e37-2 x.x.x.x
-151.216.14.128 26 e39-1 x.x.x.x
-151.216.14.192 26 e39-2 x.x.x.x
-151.216.15.0 26 e41-1 x.x.x.x
-151.216.15.64 26 e41-2 x.x.x.x
-151.216.15.128 26 e43-1 x.x.x.x
-151.216.15.192 26 e43-2 x.x.x.x
-151.216.16.0 26 e43-3 x.x.x.x
-151.216.16.64 26 e43-4 x.x.x.x
-151.216.16.128 26 e45-1 x.x.x.x
-151.216.16.192 26 e45-2 x.x.x.x
-151.216.17.0 26 e45-3 x.x.x.x
-151.216.17.64 26 e45-4 x.x.x.x
-151.216.17.128 26 e47-1 x.x.x.x
-151.216.17.192 26 e47-2 x.x.x.x
-151.216.18.0 26 e47-3 x.x.x.x
-151.216.18.64 26 e47-4 x.x.x.x
-151.216.18.128 26 e49-1 x.x.x.x
-151.216.18.192 26 e49-2 x.x.x.x
-151.216.19.0 26 e49-3 x.x.x.x
-151.216.19.64 26 e49-4 x.x.x.x
-151.216.19.128 26 e51-1 x.x.x.x
-151.216.19.192 26 e51-2 x.x.x.x
-151.216.20.0 26 e51-3 x.x.x.x
-151.216.20.64 26 e51-4 x.x.x.x
-151.216.20.128 26 e53-1 x.x.x.x
-151.216.20.192 26 e53-2 x.x.x.x
-151.216.21.0 26 e53-3 x.x.x.x
-151.216.21.64 26 e53-4 x.x.x.x
-151.216.21.128 26 e55-1 x.x.x.x
-151.216.21.192 26 e55-2 x.x.x.x
-151.216.22.0 26 e55-3 x.x.x.x
-151.216.22.64 26 e55-4 x.x.x.x
-151.216.22.128 26 e57-1 x.x.x.x
-151.216.22.192 26 e57-2 x.x.x.x
-151.216.23.0 26 e57-3 x.x.x.x
-151.216.23.64 26 e57-4 x.x.x.x
-151.216.23.128 26 e59-1 x.x.x.x
-151.216.23.192 26 e59-2 x.x.x.x
-151.216.24.0 26 e59-3 x.x.x.x
-151.216.24.64 26 e59-4 x.x.x.x
-151.216.24.128 26 e61-1 x.x.x.x
-151.216.24.192 26 e61-2 x.x.x.x
-151.216.25.0 26 e61-3 x.x.x.x
-151.216.25.64 26 e61-4 x.x.x.x
-151.216.25.128 26 e63-1 x.x.x.x
-151.216.25.192 26 e63-2 x.x.x.x
-151.216.26.0 26 e63-3 x.x.x.x
-151.216.26.64 26 e63-4 x.x.x.x
-151.216.26.128 26 e65-1 x.x.x.x
-151.216.26.192 26 e65-2 x.x.x.x
-151.216.27.0 26 e65-3 x.x.x.x
-151.216.27.64 26 e65-4 x.x.x.x
-151.216.27.128 26 e67-1 x.x.x.x
-151.216.27.192 26 e67-2 x.x.x.x
-151.216.28.0 26 e67-3 x.x.x.x
-151.216.28.64 26 e67-4 x.x.x.x
-151.216.28.128 26 e69-1 x.x.x.x
-151.216.28.192 26 e69-2 x.x.x.x
-151.216.29.0 26 e69-3 x.x.x.x
-151.216.29.64 26 e69-4 x.x.x.x
-151.216.29.128 26 e71-1 x.x.x.x
-151.216.29.192 26 e71-2 x.x.x.x
-151.216.30.0 26 e71-3 x.x.x.x
-151.216.30.64 26 e71-4 x.x.x.x
-151.216.30.128 26 e73-1 x.x.x.x
-151.216.30.192 26 e73-2 x.x.x.x
-151.216.31.0 26 e73-3 x.x.x.x
-151.216.31.64 26 e73-4 x.x.x.x
-151.216.31.128 26 e75-1 x.x.x.x
-151.216.31.192 26 e75-2 x.x.x.x
-151.216.32.0 26 e75-3 x.x.x.x
-151.216.32.64 26 e75-4 x.x.x.x
-151.216.32.128 26 e77-1 x.x.x.x
-151.216.32.192 26 e77-2 x.x.x.x
+151.216.129.0 26 e1-3
+151.216.129.64 26 e1-4
+151.216.129.128 26 e3-3
+151.216.129.192 26 e3-4
+151.216.130.0 26 e5-3
+151.216.130.64 26 e5-4
+151.216.130.128 26 e7-3
+151.216.130.192 26 e7-4
+151.216.131.0 26 e9-3
+151.216.131.64 26 e9-4
+151.216.131.128 26 e11-1
+151.216.131.192 26 e11-2
+151.216.132.0 26 e11-3
+151.216.132.64 26 e11-4
+151.216.132.128 26 e13-1
+151.216.132.192 26 e13-2
+151.216.133.0 26 e13-3
+151.216.133.64 26 e13-4
+151.216.133.128 26 e15-1
+151.216.133.192 26 e15-2
+151.216.134.0 26 e15-3
+151.216.134.64 26 e15-4
+151.216.134.128 26 e17-1
+151.216.134.192 26 e17-2
+151.216.135.0 26 e17-3
+151.216.135.64 26 e17-4
+151.216.135.128 26 e19-1
+151.216.135.192 26 e19-2
+151.216.136.0 26 e19-3
+151.216.136.64 26 e19-4
+151.216.136.128 26 e21-1
+151.216.136.192 26 e21-2
+151.216.137.0 26 e21-3
+151.216.137.64 26 e21-4
+151.216.137.128 26 e23-1
+151.216.137.192 26 e23-2
+151.216.138.0 26 e23-3
+151.216.138.64 26 e23-4
+151.216.138.128 26 e25-1
+151.216.138.192 26 e25-2
+151.216.139.0 26 e25-3
+151.216.139.64 26 e25-4
+151.216.139.128 26 e27-1
+151.216.139.192 26 e27-2
+151.216.140.0 26 e29-1
+151.216.140.64 26 e29-2
+151.216.140.128 26 e31-1
+151.216.140.192 26 e31-2
+151.216.141.0 26 e33-1
+151.216.141.64 26 e33-2
+151.216.141.128 26 e35-1
+151.216.141.192 26 e35-2
+151.216.142.0 26 e37-1
+151.216.142.64 26 e37-2
+151.216.142.128 26 e39-1
+151.216.142.192 26 e39-2
+151.216.143.0 26 e41-1
+151.216.143.64 26 e41-2
+151.216.143.128 26 e43-1
+151.216.143.192 26 e43-2
+151.216.144.0 26 e43-3
+151.216.144.64 26 e43-4
+151.216.144.128 26 e45-1
+151.216.144.192 26 e45-2
+151.216.145.0 26 e45-3
+151.216.145.64 26 e45-4
+151.216.145.128 26 e47-1
+151.216.145.192 26 e47-2
+151.216.146.0 26 e47-3
+151.216.146.64 26 e47-4
+151.216.146.128 26 e49-1
+151.216.146.192 26 e49-2
+151.216.147.0 26 e49-3
+151.216.147.64 26 e49-4
+151.216.147.128 26 e51-1
+151.216.147.192 26 e51-2
+151.216.148.0 26 e51-3
+151.216.148.64 26 e51-4
+151.216.148.128 26 e53-1
+151.216.148.192 26 e53-2
+151.216.149.0 26 e53-3
+151.216.149.64 26 e53-4
+151.216.149.128 26 e55-1
+151.216.149.192 26 e55-2
+151.216.150.0 26 e55-3
+151.216.150.64 26 e55-4
+151.216.150.128 26 e57-1
+151.216.150.192 26 e57-2
+151.216.151.0 26 e57-3
+151.216.151.64 26 e57-4
+151.216.151.128 26 e59-1
+151.216.151.192 26 e59-2
+151.216.152.0 26 e59-3
+151.216.152.64 26 e59-4
+151.216.152.128 26 e61-1
+151.216.152.192 26 e61-2
+151.216.153.0 26 e61-3
+151.216.153.64 26 e61-4
+151.216.153.128 26 e63-1
+151.216.153.192 26 e63-2
+151.216.154.0 26 e63-3
+151.216.154.64 26 e63-4
+151.216.154.128 26 e65-1
+151.216.154.192 26 e65-2
+151.216.155.0 26 e65-3
+151.216.155.64 26 e65-4
+151.216.155.128 26 e67-1
+151.216.155.192 26 e67-2
+151.216.156.0 26 e67-3
+151.216.156.64 26 e67-4
+151.216.156.128 26 e69-1
+151.216.156.192 26 e69-2
+151.216.157.0 26 e69-3
+151.216.157.64 26 e69-4
+151.216.157.128 26 e71-1
+151.216.157.192 26 e71-2
+151.216.158.0 26 e71-3
+151.216.158.64 26 e71-4
+151.216.158.128 26 e73-1
+151.216.158.192 26 e73-2
+151.216.159.0 26 e73-3
+151.216.159.64 26 e73-4
+151.216.159.128 26 e75-1
+151.216.159.192 26 e75-2
+151.216.160.0 26 e75-3
+151.216.160.64 26 e75-4
+151.216.160.128 26 e77-1
+151.216.160.192 26 e77-2
+151.216.161.0 26 e77-3
+151.216.161.64 26 e77-4
+151.216.161.128 26 e79-1
+151.216.161.192 26 e79-2
+151.216.162.0 26 e81-1
+151.216.162.64 26 e81-2
diff --git a/tools/make-switch-placements.pl b/tools/make-switch-placements.pl
index 58538e2..7bfb889 100755
--- a/tools/make-switch-placements.pl
+++ b/tools/make-switch-placements.pl
@@ -23,32 +23,32 @@ while (<STDIN>) {
 		$name =~ /e(\d+)-(\d+)/;
 		my ($e, $s) = ($1, $2);
 
-		$x = int(220 + (($e-1)/2) * 21.5);
+		$x = int(205 + (($e-1)/2) * 20.2);
 		$y = undef;
 
-		$x += 10 if ($e >= 11);
-		$x += 10 if ($e >= 27);
-		$x += 10 if ($e >= 43);
-		$x += 10 if ($e >= 59);
+		$x += 8 if ($e >= 11);
+		$x += 6 if ($e >= 27);
+		$x += 12 if ($e >= 43);
+		$x += 7 if ($e >= 60);
 
 		if ($s > 2) {
-			$y = 310 - 84 * ($s-2);
+			$y = 328 - 84 * ($s-2);
 		} else {
-			$y = 507 - 84 * ($s);
+			$y = 519 - 84 * ($s);
 		}
 
 		$xx = $x + 14;
 		$yy = $y + 84;
 
 		# Justeringer
-		$y += 42 if $name eq "e1-4";
-		$y += 28 if $name eq "e3-4";
-		$y += 14 if $name eq "e5-4";
+		$y += 45 if $name eq "e1-4";
+		$y += 20 if $name eq "e3-4";
+		$y += 15 if $name eq "e5-4";
 
-		$yy -= 14 if $name eq "e77-1";
-		$yy -= 28 if $name eq "e79-1";
-		$yy -= 42 if $name eq "e81-1";
-		$yy -= 56 if $name eq "e83-1";
+		#$yy -= 14 if $name eq "e77-1";
+		#$yy -= 28 if $name eq "e79-1";
+		$yy -= 15 if $name eq "e81-1";
+		#$yy -= 56 if $name eq "e83-1";
 	} elsif ($name =~ /^creative(\d+)$/) {
 		my $s = $1;
 		if ($s < 3) {