diff --git a/src/impl/Afficheur.java b/src/impl/Afficheur.java
index 51c89fa..daed745 100644
--- a/src/impl/Afficheur.java
+++ b/src/impl/Afficheur.java
@@ -1,5 +1,12 @@
 package impl;
 
-public class Afficheur {
+import interfaces.Capteur;
+import interfaces.ObserverdeCapteur;
 
+public class Afficheur implements ObserverdeCapteur {
+    //AO1 - concrete servant
+    @Override
+    public void update(Capteur subject) {
+
+    }
 }
diff --git a/src/impl/Canal.java b/src/impl/Canal.java
index e6d9ca7..4e532c1 100644
--- a/src/impl/Canal.java
+++ b/src/impl/Canal.java
@@ -1,5 +1,21 @@
 package impl;
 
-public class Canal {
+import interfaces.Capteur;
+import interfaces.CapteurAsync;
+import interfaces.ObserverDeCapteurAsync;
 
+import java.util.concurrent.Future;
+
+public class Canal implements ObserverDeCapteurAsync, CapteurAsync {
+    //AO1 - proxy
+    @Override
+    public Future<?> update(Capteur c) {
+        return null;
+    }
+
+    //AO2 - proxy
+    @Override
+    public Future<Integer> getValue() {
+        return null;
+    }
 }
diff --git a/src/impl/CapteurImpl.java b/src/impl/CapteurImpl.java
index 1f71cd2..d4b0b08 100644
--- a/src/impl/CapteurImpl.java
+++ b/src/impl/CapteurImpl.java
@@ -1,5 +1,28 @@
 package impl;
 
-public class CapteurImpl {
+import interfaces.Capteur;
+import interfaces.Observer;
 
+public class CapteurImpl implements Capteur {
+
+    @Override
+    public void attach(Observer o) {
+
+    }
+
+    @Override
+    public void detach(Observer o) {
+
+    }
+
+    @Override
+    public void tick() {
+
+    }
+
+    //AO2 - Concrete Servant
+    @Override
+    public int getValue() {
+        return 0;
+    }
 }
diff --git a/src/impl/GetValue.java b/src/impl/GetValue.java
new file mode 100644
index 0000000..056b7f1
--- /dev/null
+++ b/src/impl/GetValue.java
@@ -0,0 +1,11 @@
+package impl;
+
+import interfaces.MethodInvocation;
+
+public class GetValue implements MethodInvocation {
+    //AO2 - concrete MI
+    @Override
+    public void call() {
+
+    }
+}
diff --git a/src/impl/Update.java b/src/impl/Update.java
new file mode 100644
index 0000000..9fe4d1f
--- /dev/null
+++ b/src/impl/Update.java
@@ -0,0 +1,11 @@
+package impl;
+
+import interfaces.MethodInvocation;
+
+public class Update implements MethodInvocation {
+    //AO1 - concrete MI
+    @Override
+    public void call() {
+
+    }
+}
diff --git a/src/interfaces/AlgoDiffusion.java b/src/interfaces/AlgoDiffusion.java
index 9cad9a0..ffd06e1 100644
--- a/src/interfaces/AlgoDiffusion.java
+++ b/src/interfaces/AlgoDiffusion.java
@@ -1,5 +1,7 @@
 package interfaces;
+
 public interface AlgoDiffusion {
-public void configure();
-public void execture();
+    public void configure();
+
+    public void execture();
 }
diff --git a/src/interfaces/Capteur.java b/src/interfaces/Capteur.java
index 55dbea8..b9bcb0e 100644
--- a/src/interfaces/Capteur.java
+++ b/src/interfaces/Capteur.java
@@ -2,6 +2,8 @@ package interfaces;
 public interface Capteur {
     public void attach(Observer o);
     public void detach(Observer o);
-    public int getValue();
     public void tick();
+
+    //AO2 - servant
+    int getValue();
 }
diff --git a/src/interfaces/CapteurAsync.java b/src/interfaces/CapteurAsync.java
new file mode 100644
index 0000000..96d3e44
--- /dev/null
+++ b/src/interfaces/CapteurAsync.java
@@ -0,0 +1,8 @@
+package interfaces;
+
+import java.util.concurrent.Future;
+
+public interface CapteurAsync {
+    //AO2 - service
+    Future<Integer> getValue();
+}
diff --git a/src/interfaces/Future.java b/src/interfaces/Future.java
new file mode 100644
index 0000000..4b2d947
--- /dev/null
+++ b/src/interfaces/Future.java
@@ -0,0 +1,6 @@
+package interfaces;
+
+public interface Future<T> {
+    T get();
+    boolean isDone();
+}
diff --git a/src/interfaces/MethodInvocation.java b/src/interfaces/MethodInvocation.java
new file mode 100644
index 0000000..6f7126c
--- /dev/null
+++ b/src/interfaces/MethodInvocation.java
@@ -0,0 +1,5 @@
+package interfaces;
+
+public interface MethodInvocation {
+    void call();
+}
diff --git a/src/interfaces/ObserverDeCapteurAsync.java b/src/interfaces/ObserverDeCapteurAsync.java
new file mode 100644
index 0000000..e003852
--- /dev/null
+++ b/src/interfaces/ObserverDeCapteurAsync.java
@@ -0,0 +1,8 @@
+package interfaces;
+
+import java.util.concurrent.Future;
+
+public interface ObserverDeCapteurAsync {
+    //AO1 - service
+    Future<?> update(Capteur c);
+}
diff --git a/src/interfaces/ObserverdeCapteur.java b/src/interfaces/ObserverdeCapteur.java
index 3fb4f81..dc8451e 100644
--- a/src/interfaces/ObserverdeCapteur.java
+++ b/src/interfaces/ObserverdeCapteur.java
@@ -1,6 +1,6 @@
 package interfaces;
 public interface ObserverdeCapteur extends Observer<Capteur>{
-    
+    //AO1 - servant
     @Override
     public void update(Capteur subject);
 }