diff --git a/java/src/pm/Button.java b/java/src/pm/Button.java
index fc69d72..dcf6739 100644
--- a/java/src/pm/Button.java
+++ b/java/src/pm/Button.java
@@ -1,5 +1,3 @@
 package pm;
 
-public interface Button {
-
-}
+public interface Button {}
diff --git a/java/src/pm/Macro.java b/java/src/pm/Macro.java
index 0d3acbf..e1012e0 100644
--- a/java/src/pm/Macro.java
+++ b/java/src/pm/Macro.java
@@ -1,15 +1,53 @@
 package pm;
 
+import java.util.ArrayList;
+
+import pm.exception.MacroException;
+import pm.exception.macro.MacroEventOrderException;
 import pm.macro.Event;
+import pm.macro.event.Hold;
+import pm.macro.event.Press;
+import pm.macro.event.Release;
 
 public class Macro {
     protected Event[] eventArray;
 
-    public Macro(Event... eventArray) {
-        this.eventArray = eventArray;
+    public Macro(Event... eventArray) throws MacroException {
+        ArrayList<Button> holdList = new ArrayList<Button>();
+        ArrayList<Event> eventList = new ArrayList<Event>();
+        for (Event event : eventArray) {
+            Button button = event.getButton();
+            if (event instanceof Press) {
+                if (holdList.contains(button)) {
+                    throw new MacroEventOrderException("Press events cannot follow hold events for the same button.");
+                }
+                eventList.add(event);
+                eventList.add(new Release(button));
+            } else if (event instanceof Release) {
+                if (!holdList.contains(button)) {
+                    throw new MacroEventOrderException("Cannot release a button that is not held.");
+                }
+                holdList.remove(button);
+                eventList.add(event);
+            } else if (event instanceof Hold) {
+                if (holdList.contains(button)) {
+                    throw new MacroEventOrderException("Cannot hold a button more than once.");
+                }
+                holdList.add(button);
+                eventList.add(new Press(button));
+            }
+        }
+        if (!holdList.isEmpty()) {
+            throw new MacroEventOrderException("One or more buttons are not released.");
+        }
+        this.eventArray = (Event[]) eventList.toArray(new Event[0]);
     }
 
     public int count() {
         return eventArray.length;
     }
+
+    public Event get(int i) {
+        return eventArray[i];
+    }
 }
\ No newline at end of file
diff --git a/java/src/pm/Main.java b/java/src/pm/Main.java
index 0936e99..461e214 100644
--- a/java/src/pm/Main.java
+++ b/java/src/pm/Main.java
@@ -10,9 +10,9 @@ import pm.application.voorbeeld.VoorbeeldApplication;
 import pm.device.Device;
 import pm.device.javainput.extreme3d.Extreme3DDevice;
 import pm.exception.ActionException;
-import pm.exception.EventException;
 import pm.exception.action.NotImplementedActionException;
 import pm.exception.action.UnknownTargetException;
+import pm.macro.MacroListener;
 
 public class Main extends Target {
     protected static final int SLEEP = 100;
@@ -31,6 +31,7 @@ public class Main extends Target {
         actionQueue = new ConcurrentLinkedQueue<Actions>();
         //JavaInputService.initialize();
         Device.initialise(actionQueue);
+        MacroListener.initialise(actionQueue);
     }
 
     public void addApplication(Application application) {
diff --git a/java/src/pm/action/Actions.java b/java/src/pm/action/Actions.java
index c3d8f00..8982a79 100644
--- a/java/src/pm/action/Actions.java
+++ b/java/src/pm/action/Actions.java
@@ -21,6 +21,7 @@ public enum Actions {
     }
 
     public Targets getTarget() {
+        // Todo: controle op target echt geset?
         return target;
     }
 
diff --git a/java/src/pm/device/Device.java b/java/src/pm/device/Device.java
index 6512022..61c38eb 100644
--- a/java/src/pm/device/Device.java
+++ b/java/src/pm/device/Device.java
@@ -4,6 +4,7 @@ import java.util.Queue;
 
 import pm.action.Actions;
 import pm.action.Targets;
+import pm.macro.MacroListener;
 
 public abstract class Device {
     protected static Queue<Actions> actionQueue;
diff --git a/java/src/pm/device/MacroListener.java b/java/src/pm/device/MacroListener.java
deleted file mode 100644
index c7f4ecd..0000000
--- a/java/src/pm/device/MacroListener.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package pm.device;
-
-import pm.Macro;
-
-import pm.action.Actions;
-import pm.action.Targets;
-
-
-public class MacroListener extends Thread {
-    public void add(Macro macro, Actions action, Targets target) {
-        
-    }
-}
diff --git a/java/src/pm/device/javainput/JavaInputDevice.java b/java/src/pm/device/javainput/JavaInputDevice.java
index 241fb83..d7ab342 100644
--- a/java/src/pm/device/javainput/JavaInputDevice.java
+++ b/java/src/pm/device/javainput/JavaInputDevice.java
@@ -6,15 +6,21 @@ import de.hardcode.jxinput.event.JXInputAxisEvent;
 import de.hardcode.jxinput.event.JXInputButtonEvent;
 import de.hardcode.jxinput.event.JXInputDirectionalEvent;
 
+import pm.Button;
 import pm.device.Device;
+import pm.device.javainput.extreme3d.Extreme3DButton;
+import pm.device.javainput.extreme3d.Extreme3DDirection;
 import pm.exception.DeviceException;
 import pm.exception.EventException;
 import pm.exception.device.JavaInputDeviceNotFoundException;
 import pm.exception.event.UnknownDirectionException;
+import pm.macro.event.Press;
+import pm.macro.event.Release;
 
 public abstract class JavaInputDevice extends Device {
     protected JavaInputListener javaInputListener;
     //protected JXInputDevice jxinputDevice;
+    protected Button previousDirectionalButton;
 
     protected JavaInputDevice(String name) throws DeviceException {
         super();
@@ -25,6 +31,10 @@ public abstract class JavaInputDevice extends Device {
         javaInputListener.start();
     }
 
+    public void exit() {
+        javaInputListener.exit();
+    }
+
     public static JXInputDevice getDevice(String name) throws DeviceException {
         int numberOfDevices = JXInputManager.getNumberOfDevices();
         for (int i = 0; i < numberOfDevices; ++i) {
@@ -36,7 +46,41 @@ public abstract class JavaInputDevice extends Device {
         throw new JavaInputDeviceNotFoundException();
     }
 
-    public void processEvent(JXInputAxisEvent event) {}
-    public void processEvent(JXInputButtonEvent event) throws EventException {}
-    public void processEvent(JXInputDirectionalEvent event) throws EventException {}
+    public void processEvent(JXInputAxisEvent event) {
+        //addAction(Action.START, Target.APPLICATION);
+        //System.out.println(event);
+    }
+
+    public void processEvent(JXInputButtonEvent event) throws EventException {
+        //addAction(Action.TEST, Target.APPLICATION);
+        Button button = Extreme3DButton.create(event);
+        if (event.getButton().getState()) {
+            System.out.println("Press: " + button);
+            macroListener.add(new Press(button));
+        } else {
+            System.out.println("Release: " + button);
+            macroListener.add(new Release(button));
+        }
+        //System.out.println(button);
+        //System.out.println(button.getType() + " " + button.getName() +" " + );
+    }
+
+    public void processEvent(JXInputDirectionalEvent event) throws UnknownDirectionException {
+        //addAction(Action.EXIT, Target.APPLICATION);
+        //Directional directional = event.getDirectional();
+        Button button = Extreme3DDirection.create(event);
+        if (event.getDirectional().isCentered()) {
+            if (previousDirectionalButton != null) {
+                System.out.println("Release: " + previousDirectionalButton);
+                macroListener.add(new Release(previousDirectionalButton));
+            }
+        } else {
+            System.out.println("Press: " + button);
+            macroListener.add(new Press(button));
+            previousDirectionalButton = button;
+        }
+        //System.out.println(Extreme3DDirection.create(event));
+        //System.out.println(Extreme3DButton.create(event));
+        //System.out.println(directional.isCentered() + " " + directional.getValue() + " [" + directional.getName() + "] " + directional.getResolution() + " " + directional.getDirection());
+    }
 }
diff --git a/java/src/pm/device/javainput/JavaInputListener.java b/java/src/pm/device/javainput/JavaInputListener.java
index b48c02c..e260e0d 100644
--- a/java/src/pm/device/javainput/JavaInputListener.java
+++ b/java/src/pm/device/javainput/JavaInputListener.java
@@ -98,4 +98,8 @@ public class JavaInputListener extends Thread implements JXInputAxisEventListene
             }
         }
     }
+
+    public void exit() {
+        run = false;
+    }
 }
diff --git a/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java b/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java
index b48ea53..b61ab89 100644
--- a/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java
+++ b/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java
@@ -1,14 +1,14 @@
 package pm.device.javainput.extreme3d;
 
-import de.hardcode.jxinput.event.JXInputAxisEvent;
-import de.hardcode.jxinput.event.JXInputButtonEvent;
-import de.hardcode.jxinput.event.JXInputDirectionalEvent;
-
 import pm.Macro;
+import pm.action.Actions;
+import pm.action.Targets;
 import pm.device.javainput.JavaInputDevice;
 import pm.exception.DeviceException;
-import pm.exception.EventException;
-import pm.exception.event.UnknownDirectionException;
+import pm.exception.MacroException;
+import pm.macro.event.Hold;
+import pm.macro.event.Press;
+import pm.macro.event.Release;
 
 public class Extreme3DDevice extends JavaInputDevice {
 
@@ -20,42 +20,17 @@ public class Extreme3DDevice extends JavaInputDevice {
 
     public void start() {
         super.start();
-        macroListener.addMacro(
-            new Macro(
-                new Hold(Button.A),
-                new Press(Button.B),
-                new Press(Button.TWO),
-                new Release(Button.A)),
-            Action.EXIT, Target.APPLICATION));
-    }
-
-    public void processEvent(JXInputAxisEvent event) {
-        //addAction(Action.START, Target.APPLICATION);
-        //System.out.println(event);
-    }
-
-    public void processEvent(JXInputButtonEvent event) throws EventException {
-        //addAction(Action.TEST, Target.APPLICATION);
-        if (event.getButton().getState()) {
-            // press
-        } else {
-            // release
+        try {
+            macroListener.add(
+                new Macro(
+                    new Hold(Extreme3DButton.ONE),
+                    new Press(Extreme3DButton.TWO),
+                    new Press(Extreme3DButton.ELEVEN),
+                    new Release(Extreme3DButton.ONE)),
+                Actions.EXIT,
+                Targets.MAIN);
+        } catch (MacroException e) {
+            e.printStackTrace();
         }
-        System.out.println(Extreme3DButton.create(event));
-        //System.out.println(button.getType() + " " + button.getName() +" " + );
     }
-
-    public void processEvent(JXInputDirectionalEvent event) throws UnknownDirectionException {
-        //addAction(Action.EXIT, Target.APPLICATION);
-        //Directional directional = event.getDirectional();
-        if (event.getDirectional().isCentered()) {
-            // release
-        } else {
-            // press
-        }
-        System.out.println(Extreme3DDirection.create(event));
-        //System.out.println(Extreme3DButton.create(event));
-        //System.out.println(directional.isCentered() + " " + directional.getValue() + " [" + directional.getName() + "] " + directional.getResolution() + " " + directional.getDirection());
-    }
-
 }
diff --git a/java/src/pm/exception/MacroException.java b/java/src/pm/exception/MacroException.java
new file mode 100644
index 0000000..36d0a83
--- /dev/null
+++ b/java/src/pm/exception/MacroException.java
@@ -0,0 +1,9 @@
+package pm.exception;
+
+public class MacroException extends Exception {
+    protected static final long serialVersionUID = 1L;
+
+    public MacroException(String message) {
+        super(message);
+    }
+}
diff --git a/java/src/pm/exception/macro/MacroEventOrderException.java b/java/src/pm/exception/macro/MacroEventOrderException.java
new file mode 100644
index 0000000..e630d70
--- /dev/null
+++ b/java/src/pm/exception/macro/MacroEventOrderException.java
@@ -0,0 +1,11 @@
+package pm.exception.macro;
+
+import pm.exception.MacroException;
+
+public class MacroEventOrderException extends MacroException {
+    protected static final long serialVersionUID = 1L;
+
+    public MacroEventOrderException(String message) {
+        super(message);
+    }
+}
diff --git a/java/src/pm/macro/Active.java b/java/src/pm/macro/Active.java
new file mode 100644
index 0000000..f618048
--- /dev/null
+++ b/java/src/pm/macro/Active.java
@@ -0,0 +1,26 @@
+package pm.macro;
+
+import pm.Macro;
+
+public class Active {
+    protected Macro macro;
+    protected int step;
+
+    public Active(Macro macro) {
+        this.macro = macro;
+        step = -1;
+    }
+
+    public Macro getMacro() {
+        return macro;
+    }
+
+    public boolean next(Event event) {
+        Event next = macro.get(++step);
+        return next == null ? false : event.equals(next);
+    }
+
+    public boolean last() {
+        return step == macro.count() - 1;
+    }
+}
diff --git a/java/src/pm/macro/Event.java b/java/src/pm/macro/Event.java
index 40d1879..7bdec66 100644
--- a/java/src/pm/macro/Event.java
+++ b/java/src/pm/macro/Event.java
@@ -2,6 +2,18 @@ package pm.macro;
 
 import pm.Button;
 
-public interface Event {
-    public Button button = null;
+public abstract class Event {
+    protected Button button;
+    
+    public Event(Button button) {
+        this.button = button;
+    }
+
+    public Button getButton() {
+        return button;
+    }
+
+    public boolean equals(Event event) {
+        return event.getClass().equals(getClass()) && event.getButton().equals(button); // Todo: controleren of equals goed werkt bij buttons van verschillende typen
+    }
 }
diff --git a/java/src/pm/macro/MacroListener.java b/java/src/pm/macro/MacroListener.java
new file mode 100644
index 0000000..65ba30e
--- /dev/null
+++ b/java/src/pm/macro/MacroListener.java
@@ -0,0 +1,54 @@
+package pm.macro;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Queue;
+
+import pm.Macro;
+
+import pm.action.Actions;
+import pm.action.Targets;
+
+public class MacroListener extends Thread {
+    protected static Queue<Actions> actionQueue;
+
+    public ArrayList<Macro> macroList;
+    public HashMap<Macro, Actions> actionMap;
+    public ArrayList<Active> activeList;
+    
+    public MacroListener() {
+        macroList = new ArrayList<Macro>();
+        actionMap = new HashMap<Macro, Actions>();
+        activeList = new ArrayList<Active>();
+    }
+
+    public void add(Macro macro, Actions action, Targets target) {
+        action.setTarget(target); // Todo: target en action duidelijker integreren / hernoemen.
+        macroList.add(macro);
+        actionMap.put(macro, action);
+    }
+
+    public void add(Event event) {
+        for (Macro macro : macroList) {
+            activeList.add(new Active(macro));
+        }
+        ArrayList<Active> removeList = new ArrayList<Active>();
+        for (Active active : activeList) {
+            if (active.next(event)) {
+                if (active.last()) {
+                    actionQueue.add(actionMap.get(active.getMacro())); // Todo: dit indirect doen?
+                    removeList.add(active);
+                }
+            } else {
+                removeList.add(active);
+            }
+        }
+        for (Active active : removeList) {
+            activeList.remove(active);
+        }
+    }
+
+    public static void initialise(Queue<Actions> actionQueue) {
+        MacroListener.actionQueue = actionQueue;        
+    }
+}
diff --git a/java/src/pm/macro/event/Hold.java b/java/src/pm/macro/event/Hold.java
index 8e2f4ca..dad6b4f 100644
--- a/java/src/pm/macro/event/Hold.java
+++ b/java/src/pm/macro/event/Hold.java
@@ -3,10 +3,8 @@ package pm.macro.event;
 import pm.Button;
 import pm.macro.Event;
 
-public class Hold implements Event {
-    public Button button;
-    
+public class Hold extends Event {  
     public Hold(Button button) {
-        this.button = button;
+        super(button);
     }
 }
\ No newline at end of file
diff --git a/java/src/pm/macro/event/Press.java b/java/src/pm/macro/event/Press.java
index a564b7d..d9d3af6 100644
--- a/java/src/pm/macro/event/Press.java
+++ b/java/src/pm/macro/event/Press.java
@@ -3,10 +3,8 @@ package pm.macro.event;
 import pm.Button;
 import pm.macro.Event;
 
-public class Press implements Event {
-    public Button button;
-    
+public class Press extends Event {
     public Press(Button button) {
-        this.button = button;
+        super(button);
     }
 }
diff --git a/java/src/pm/macro/event/Release.java b/java/src/pm/macro/event/Release.java
index fc72062..9d5a6a3 100644
--- a/java/src/pm/macro/event/Release.java
+++ b/java/src/pm/macro/event/Release.java
@@ -3,10 +3,8 @@ package pm.macro.event;
 import pm.Button;
 import pm.macro.Event;
 
-public class Release implements Event {
-    public Button button;
-    
+public class Release extends Event {   
     public Release(Button button) {
-        this.button = button;
+        super(button);
     }
 }