diff --git a/src/main/java/org/academiadecodigo/simplegraphics/mouse/Mouse.java b/src/main/java/org/academiadecodigo/simplegraphics/mouse/Mouse.java
index b2e780a..9199211 100644
--- a/src/main/java/org/academiadecodigo/simplegraphics/mouse/Mouse.java
+++ b/src/main/java/org/academiadecodigo/simplegraphics/mouse/Mouse.java
@@ -24,37 +24,36 @@ public Mouse(MouseHandler handler) {
 
     @Override
     public void mouseClicked(MouseEvent e) {
-        handler.mouseClicked(new org.academiadecodigo.simplegraphics.mouse.MouseEvent(e.getX(), e.getY()));
+        handler.mouseClicked(new org.academiadecodigo.simplegraphics.mouse.MouseEvent(e.getX(), e.getY(), e.getButton()));
     }
 
     @Override
     public void mouseMoved(MouseEvent e) {
-        handler.mouseMoved(new org.academiadecodigo.simplegraphics.mouse.MouseEvent(e.getX(), e.getY()));
+        handler.mouseMoved(new org.academiadecodigo.simplegraphics.mouse.MouseEvent(e.getX(), e.getY(), e.getButton()));
     }
 
     @Override
     public void mousePressed(MouseEvent e) {
-
+        handler.mousePressed(new org.academiadecodigo.simplegraphics.mouse.MouseEvent(e.getX(), e.getY(), e.getButton()));
     }
 
     @Override
     public void mouseReleased(MouseEvent e) {
-
+        handler.mouseReleased(new org.academiadecodigo.simplegraphics.mouse.MouseEvent(e.getX(), e.getY(), e.getButton()));
     }
 
     @Override
     public void mouseEntered(MouseEvent e) {
-
+        handler.mouseEntered(new org.academiadecodigo.simplegraphics.mouse.MouseEvent(e.getX(), e.getY(), e.getButton()));
     }
 
     @Override
     public void mouseExited(MouseEvent e) {
-
+        handler.mouseExited(new org.academiadecodigo.simplegraphics.mouse.MouseEvent(e.getX(), e.getY(), e.getButton()));
     }
 
     @Override
     public void mouseDragged(MouseEvent e) {
-
+        handler.mouseDragged(new org.academiadecodigo.simplegraphics.mouse.MouseEvent(e.getX(), e.getY(), e.getButton()));
     }
-
 }
diff --git a/src/main/java/org/academiadecodigo/simplegraphics/mouse/MouseEvent.java b/src/main/java/org/academiadecodigo/simplegraphics/mouse/MouseEvent.java
index ce09b48..88bd64b 100644
--- a/src/main/java/org/academiadecodigo/simplegraphics/mouse/MouseEvent.java
+++ b/src/main/java/org/academiadecodigo/simplegraphics/mouse/MouseEvent.java
@@ -5,8 +5,13 @@
  */
 public class MouseEvent {
 
+    /** Mouse Buttons */
+    public static final int LEFT_CLICK = java.awt.event.MouseEvent.BUTTON1;
+    public static final int RIGHT_CLICK = java.awt.event.MouseEvent.BUTTON2;
+
     private double x;
     private double y;
+    private int mouseButton;
 
     /**
      * Gets the X coordinate where the mouse clicked
@@ -32,9 +37,10 @@ public void setY(double y) {
         this.y = y;
     }
 
-    public MouseEvent(double x, double y) {
+    public MouseEvent(double x, double y, int mouseButton) {
         this.x = x;
         this.y = y;
+        this.mouseButton = mouseButton;
     }
 
     @Override
@@ -44,4 +50,12 @@ public String toString() {
                 ", y=" + y +
                 '}';
     }
+
+    /**
+     * Returns what button was pressed
+     * @return
+     */
+    public int getMouseButton() {
+        return mouseButton;
+    }
 }
diff --git a/src/main/java/org/academiadecodigo/simplegraphics/mouse/MouseHandler.java b/src/main/java/org/academiadecodigo/simplegraphics/mouse/MouseHandler.java
index fb183a6..870ccdc 100644
--- a/src/main/java/org/academiadecodigo/simplegraphics/mouse/MouseHandler.java
+++ b/src/main/java/org/academiadecodigo/simplegraphics/mouse/MouseHandler.java
@@ -18,4 +18,13 @@ public interface MouseHandler {
      */
     public void mouseMoved(MouseEvent e);
 
+    public void mousePressed(MouseEvent e);
+
+    public void mouseReleased(MouseEvent e);
+
+    public void mouseEntered(MouseEvent e);
+
+    public void mouseExited(MouseEvent e);
+
+    public void mouseDragged(MouseEvent e);
 }
diff --git a/src/test/java/org/academiadecodigo/simplegraphics/test/Tester.java b/src/test/java/org/academiadecodigo/simplegraphics/test/Tester.java
index 56eb146..d4f1d2c 100644
--- a/src/test/java/org/academiadecodigo/simplegraphics/test/Tester.java
+++ b/src/test/java/org/academiadecodigo/simplegraphics/test/Tester.java
@@ -93,4 +93,29 @@ public void mouseClicked(MouseEvent e) {
     public void mouseMoved(MouseEvent e) {
 
     }
+
+    @Override
+    public void mousePressed(MouseEvent e) {
+
+    }
+
+    @Override
+    public void mouseReleased(MouseEvent e) {
+
+    }
+
+    @Override
+    public void mouseEntered(MouseEvent e) {
+
+    }
+
+    @Override
+    public void mouseExited(MouseEvent e) {
+
+    }
+
+    @Override
+    public void mouseDragged(MouseEvent e) {
+
+    }
 }