diff --git a/static/admin.html b/static/admin.html
new file mode 100644
index 0000000..0951fcc
--- /dev/null
+++ b/static/admin.html
@@ -0,0 +1,168 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>Traque | Client admin</title>
+
+	<!-- LEAFLET INCLUDE -->
+	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
+	integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
+	crossorigin=""/>
+	<script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
+	integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
+	crossorigin=""></script>
+
+	<!-- SOCKET.IO INCLUDE -->
+	<script src="/socket.io/socket.io.js"></script>
+
+	<style type="text/css">
+		#map { height: 500px; }
+	</style>
+</head>
+<body>
+	<div id="map"></div><br/>
+
+	<input id="popup"/><button id="sendPopup">Send popup to all clients</button><br/>
+
+	<script type="text/javascript">
+
+		var protocol = location.protocol;
+		var server = location.hostname;
+		var port = location.port;
+		var socket = io.connect({rejectUnauthorized: false},
+            protocol+"://"+server+":"+port);
+
+		var id = -1;
+		var names = [];
+		var colors = [];
+        var markers = [];
+		var icons = [ 
+            L.icon({
+		        iconUrl: 'def.png',
+		        iconSize: [10, 10],
+		        iconAnchor: [5, 5],
+		        popupAnchor: [5, 5],
+		        //shadowUrl: 'my-icon-shadow.png',
+		        //shadowSize: [68, 95],
+		        //shadowAnchor: [22, 94]
+	        }),
+            L.icon({
+		        iconUrl: 'track.png',
+		        iconSize: [10, 10],
+		        iconAnchor: [5, 5],
+		        popupAnchor: [5, 5],
+		        //shadowUrl: 'my-icon-shadow.png',
+		        //shadowSize: [68, 95],
+		        //shadowAnchor: [22, 94]
+	        })
+        ];
+		var self_icons = icons;
+        var icon_invisible = 
+            L.icon({
+		        iconUrl: 'invi.png',
+		        iconSize: [10, 10],
+		        iconAnchor: [5, 5],
+		        popupAnchor: [5, 5],
+		        //shadowUrl: 'my-icon-shadow.png',
+		        //shadowSize: [68, 95],
+		        //shadowAnchor: [22, 94]
+	        });
+
+		//////////////////////////////////////////////////////////////////////////////
+		// INIT MAP
+
+		var map = L.map('map').setView([48.8448, 2.3550], 13);
+
+		L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+		    maxZoom: 19,
+		    attribution: '© OpenStreetMap'
+		}).addTo(map);
+
+		//////////////////////////////////////////////////////////////////////////////
+		// UPDATE MAP
+
+		socket.on("yourId", function(data){
+			console.log("yourId", data);
+			id = data.id;
+			if(!(id in colors))
+				colors[id] = 0;
+			if(id in markers)
+				markers[id].setIcon(self_icons[colors[id]]);
+
+			socket.emit("admin");
+		});
+
+		socket.on("setName", function(data){
+			console.log("setName", data);
+			names[data.id] = data.name;
+			if(data.id in markers)
+				markers[data.id].bindPopup(data.name);
+		});
+
+		socket.on("changeColor", function(data){
+			console.log("changeColor", data);
+			if(data.id in colors && colors[data.id] == -1 && data.id in markers)
+				markers[data.id].addTo(map);
+			colors[data.id] = data.color;
+			if(data.id in markers){
+                if(data.id == id)
+                	markers[data.id].setOpacity(0);
+				else
+                    if(data.color == -1)
+                        markers[data.id].setIcon(icon_invisible);
+                    else
+					    markers[data.id].setIcon(icons[data.color]);
+			}
+		});
+
+		socket.on("moving", function(data){
+			console.log("moving", data);
+			if(!(data.id in markers)){
+				if(!(data.id in colors))
+					colors[data.id] = 0;
+				var icon;
+				if(data.id == id)
+					icon = self_icons[colors[data.id]];
+				else
+					icon = icons[colors[data.id]];
+				markers[data.id] = L.marker(data.position, {"icon": icon}).addTo(map);
+				if(data.id == id)
+					markers[data.id].setOpacity(0);
+				if(data.id in names)
+					markers[data.id].bindPopup(names[data.id]);
+            } else{
+                markers[data.id].setLatLng(data.position);
+            }
+		});
+
+		//////////////////////////////////////////////////////////////////////////////
+		// INTERACTION
+
+		document.querySelector('#sendPopup').addEventListener('click', function(){
+			const input = document.querySelector('#popup');
+
+			socket.emit("popup", {"content": input.value});
+		});
+
+		//////////////////////////////////////////////////////////////////////////////
+		// GEOLOCALISATION
+
+		function geoLoc_success(pos) {
+            socket.emit("geoLoc", {"position": [pos.coords.latitude, pos.coords.longitude]});
+		}
+
+		function geoLoc_error(err) {
+			console.error(`ERROR(${err.code}): ${err.message}`);
+		}
+
+		var options = {
+			enableHighAccuracy: false,
+			timeout: 5000,
+			maximumAge: 0
+		};
+
+		id = navigator.geolocation.watchPosition(geoLoc_success, geoLoc_error, options);
+	</script>
+</body>
+</html>
diff --git a/static/conscrit.html b/static/conscrit.html
new file mode 100644
index 0000000..c6b12fd
--- /dev/null
+++ b/static/conscrit.html
@@ -0,0 +1,182 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<title>Traque | Client conscrit</title>
+
+	<!-- LEAFLET INCLUDE -->
+	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
+	integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="
+	crossorigin=""/>
+	<script src="https://unpkg.com/leaflet@1.8.0/dist/leaflet.js"
+	integrity="sha512-BB3hKbKWOc9Ez/TAwyWxNXeoV9c1v6FIeYiBieIWkpLjauysF18NzgR1MBNBXf8/KABdlkX68nAhlwcDFLGPCQ=="
+	crossorigin=""></script>
+
+	<!-- SOCKET.IO INCLUDE -->
+	<script src="/socket.io/socket.io.js"></script>
+
+	<style type="text/css">
+		#map { height: 500px; }
+	</style>
+</head>
+<body>
+	<div id="map"></div><br/>
+
+	<input id="name"/><button id="setName">Set team name</button><br/>
+	<input id="message"/><button id="sendMessage">Send message to base</button><br/>
+
+	<script type="text/javascript">
+
+		var protocol = location.protocol;
+		var server = location.hostname;
+		var port = location.port;
+		var socket = io.connect({rejectUnauthorized: false},
+            protocol+"://"+server+":"+port);
+
+		var id = -1;
+		var names = [];
+		var colors = [];
+        var markers = [];
+		var icons = [ 
+            L.icon({
+		        iconUrl: 'def.png',
+		        iconSize: [10, 10],
+		        iconAnchor: [5, 5],
+		        popupAnchor: [5, 5],
+		        //shadowUrl: 'my-icon-shadow.png',
+		        //shadowSize: [68, 95],
+		        //shadowAnchor: [22, 94]
+	        }),
+            L.icon({
+		        iconUrl: 'track.png',
+		        iconSize: [10, 10],
+		        iconAnchor: [5, 5],
+		        popupAnchor: [5, 5],
+		        //shadowUrl: 'my-icon-shadow.png',
+		        //shadowSize: [68, 95],
+		        //shadowAnchor: [22, 94]
+	        })
+        ];
+		var self_icons = icons;
+        var self_invisible = 
+            L.icon({
+		        iconUrl: 'invi.png',
+		        iconSize: [10, 10],
+		        iconAnchor: [5, 5],
+		        popupAnchor: [5, 5],
+		        //shadowUrl: 'my-icon-shadow.png',
+		        //shadowSize: [68, 95],
+		        //shadowAnchor: [22, 94]
+	        });
+
+		//////////////////////////////////////////////////////////////////////////////
+		// INIT MAP
+
+		var map = L.map('map').setView([48.8448, 2.3550], 13);
+
+		L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+		    maxZoom: 19,
+		    attribution: '© OpenStreetMap'
+		}).addTo(map);
+
+		//////////////////////////////////////////////////////////////////////////////
+		// UPDATE MAP
+
+		socket.on("yourId", function(data){
+			console.log("yourId", data);
+			id = data.id;
+			if(!(id in colors))
+				colors[id] = 0;
+			if(id in markers)
+				markers[id].setIcon(self_icons[colors[id]]);
+		});
+
+		socket.on("setName", function(data){
+			console.log("setName", data);
+			names[data.id] = data.name;
+			if(data.id in markers)
+				markers[data.id].bindPopup(data.name);
+		});
+
+		socket.on("changeColor", function(data){
+			console.log("changeColor", data);
+			if(data.id in colors && colors[data.id] == -1 && data.id in markers)
+				markers[data.id].addTo(map);
+			colors[data.id] = data.color;
+			if(data.id in markers){
+                if(data.id == id)
+                    if(data.color == -1)
+                        markers[data.id].setIcon(self_invisible);
+                    else
+					    markers[data.id].setIcon(self_icons[data.color]);
+				else
+                    if(data.color == -1)
+                        markers[data.id].setOpacity(0);
+                    else{
+                        markers[data.id].setOpacity(1);
+					    markers[data.id].setIcon(icons[data.color]);
+                    }
+			}
+		});
+
+		socket.on("moving", function(data){
+			console.log("moving", data);
+			if(!(data.id in markers)){
+				if(!(data.id in colors))
+					colors[data.id] = 0;
+				var icon;
+				if(data.id == id)
+					icon = self_icons[colors[data.id]];
+				else
+					icon = icons[colors[data.id]];
+				markers[data.id] = L.marker(data.position, {"icon": icon}).addTo(map);
+				if(data.id == id)
+					markers[data.id].setZIndexOffset(10000);
+				if(data.id in names)
+					markers[data.id].bindPopup(names[data.id]);
+            } else{
+                markers[data.id].setLatLng(data.position);
+            }
+		});
+
+		socket.on("popup", function(data){
+			alert(data.content);
+		});
+
+		//////////////////////////////////////////////////////////////////////////////
+		// SETTINGS -- NAME AND COLOR
+
+		document.querySelector('#setName').addEventListener('click', function(){
+			const input = document.querySelector('#name');
+
+			socket.emit("setName", {"name": input.value});
+		});
+
+		document.querySelector('#sendMessage').addEventListener('click', function(){
+			const input = document.querySelector('#message');
+
+			socket.emit("message", {"content": input.value});
+		});
+
+		//////////////////////////////////////////////////////////////////////////////
+		// GEOLOCALISATION
+
+		function geoLoc_success(pos) {
+            socket.emit("geoLoc", {"position": [pos.coords.latitude, pos.coords.longitude]});
+		}
+
+		function geoLoc_error(err) {
+			console.error(`ERROR(${err.code}): ${err.message}`);
+		}
+
+		var options = {
+			enableHighAccuracy: false,
+			timeout: 5000,
+			maximumAge: 0
+		};
+
+		id = navigator.geolocation.watchPosition(geoLoc_success, geoLoc_error, options);
+	</script>
+</body>
+</html>
diff --git a/static/vieilleux.html b/static/vieilleux.html
index 31c5c6f..8c6b37d 100644
--- a/static/vieilleux.html
+++ b/static/vieilleux.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>Leaflet - test</title>
+	<title>Traque | Client vieilleux</title>
 
 	<!-- LEAFLET INCLUDE -->
 	<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
@@ -70,6 +70,8 @@
 		        //shadowAnchor: [22, 94]
 	        });
 
+        document.getElementById('color').max = icons.length - 1;
+
 		//////////////////////////////////////////////////////////////////////////////
 		// INIT MAP
 
@@ -79,8 +81,6 @@
 		    maxZoom: 19,
 		    attribution: '© OpenStreetMap'
 		}).addTo(map);
-		
-        document.getElementById('color').max = icons.length - 1;
 
 		//////////////////////////////////////////////////////////////////////////////
 		// UPDATE MAP
diff --git a/traque.js b/traque.js
index 3b209bc..5251269 100644
--- a/traque.js
+++ b/traque.js
@@ -27,6 +27,7 @@ var MSG_TRACKER = "Vous pouvez maintenant traquer !";
 var MSG_INVISIBLE = "Les autres équipes ne peuvent plus vous voir !";
 
 var equipes = [];
+var admins = [];
 
 // require = include
 var http = require('https');//require('http');
@@ -71,15 +72,26 @@ io.sockets.on('connection', function(socket){
     socket.id = equipes.length;
     equipes.push(socket);
     socket.shown = true;
+    socket.admin = false;
     socket.color = 0;
     socket.position = [0,0];
+    socket.on('admin', function(){
+        socket.admin = true;
+        socket.shown = false;
+        admins.push(socket);
+        for(i in equipes)
+            equipes[i].emit('changeColor', {"id": socket.id, "color": -1});
+    });
 	socket.on('geoLoc', function(d){
 	    socket.position = d.position;
         if(socket.shown)
             for(i in equipes)
                 equipes[i].emit('moving', {"id": socket.id, "position": d.position});
-        else
+        else {
             socket.emit('moving', {"id": socket.id, "position": d.position});
+            for(i in admins)
+                admins[i].emit('moving', {"id": socket.id, "position": d.position})
+        }
 	});
     socket.on('changeColor', function(d){
         socket.color = d.color - 0;
@@ -121,6 +133,10 @@ io.sockets.on('connection', function(socket){
         for(i in equipes)
             equipes[i].emit('changeColor', {"id": socket.id, "color": d.color});
     });
+    socket.on('popup', function(d){
+        for(i in equipes)
+            equipes[i].emit('popup', d.data);
+    });
     socket.on('setName', function(d){
         socket.name = d.name;
         for(i in equipes)
