diff --git a/android/core/src/processing/core/PApplet.java b/android/core/src/processing/core/PApplet.java
index c93d49a49..ae99f2ff0 100644
--- a/android/core/src/processing/core/PApplet.java
+++ b/android/core/src/processing/core/PApplet.java
@@ -242,6 +242,8 @@ public class PApplet extends Activity implements PConstants, Runnable {
 
   public boolean mousePressed;
 
+  public MouseEvent mouseEvent;
+
 //  public MotionEvent motionEvent;
 
   /** Post events to the main thread that created the Activity */
@@ -2137,6 +2139,8 @@ public class PApplet extends Activity implements PConstants, Runnable {
 
 
   protected void handleMouseEvent(MouseEvent event) {
+    mouseEvent = event;
+
     // http://dev.processing.org/bugs/show_bug.cgi?id=170
     // also prevents mouseExited() on the mac from hosing the mouse
     // position, because x/y are bizarre values on the exit event.
diff --git a/android/todo.txt b/android/todo.txt
index 8200983f8..a3ec58a9e 100644
--- a/android/todo.txt
+++ b/android/todo.txt
@@ -11,6 +11,7 @@ X   http://code.google.com/p/processing/issues/detail?id=1018
 X   moving away from this anyway
 X pmouseX/Y not being set properly?
 X   http://code.google.com/p/processing/issues/detail?id=238
+X mouseEvent is back (see the Wiki)
 
 cleaning/earlier
 A Defects in the tessellation of SVG shapes in A3D
@@ -20,6 +21,16 @@ A Blacked-out screen when restoring Android app from background.
 A   http://code.google.com/p/processing/issues/detail?id=381
 X android sdk/build location has changed (android-7 not 2.1) fix build.xml
 
+motion events
+o registerMethod("motionEvent") and "mouseEvent" not implemented
+o PMotionEvent is being used internal to PApplet, need to re-wrap
+o   should be able to fire MotionEvents
+o modify MotionEvent code to use TouchEvent class, even if basic version
+o   internally, PApplet might subclass it for the pointers
+o   but queueing needs to work
+X opting to take a step backwards on the motion event handling
+_ write a little stub code for people who want to use motionX/Y/etc
+
 
 _ Finish implementation of OPEN and CHORD drawing modes for arc()
 _   http://code.google.com/p/processing/issues/detail?id=1405
@@ -43,14 +54,6 @@ _ Android emulator doesn't always start on the first attempt
 _   http://code.google.com/p/processing/issues/detail?id=1210
 
 
-implement motion/touch events
-_ registerMethod("motionEvent") and "mouseEvent" not implemented
-_ PMotionEvent is being used internal to PApplet, need to re-wrap
-_   should be able to fire MotionEvents
-_ modify MotionEvent code to use TouchEvent class, even if basic version
-_   internally, PApplet might subclass it for the pointers
-_   but queueing needs to work
-
 
 _ inside AndroidPreprocessor
 _   processing.mode.java.JavaBuild.scrubComments(sketch.getCode(0).getProgram())
diff --git a/core/todo.txt b/core/todo.txt
index 678382e13..62f768d44 100644
--- a/core/todo.txt
+++ b/core/todo.txt
@@ -25,6 +25,8 @@ X   add an additional parameter for the others
 _   http://code.google.com/p/processing/issues/detail?id=711
 X changed events to PRESS, RELEASE, CLICK, DRAG, MOVE, ENTER, EXIT
 X   instead of past-tense versions of the same
+A Implement arc() with modes on OpenGL
+A   http://code.google.com/p/processing/issues/detail?id=1406
 
 cleanup/earlier by Andres
 A when turning smoothing on, internal lines of shapes are visible
diff --git a/todo.txt b/todo.txt
index 27d7c4908..1b310ffc5 100644
--- a/todo.txt
+++ b/todo.txt
@@ -12,6 +12,8 @@ earlier
 X The sketch name can't begin with '_' (underscore)
 X   http://code.google.com/p/processing/issues/detail?id=859
 
+_ does launching p5 from inside the .zip folder cause it to quit immediately?
+
 _ fix the debug stuff before shipping this out
 
 _ remove java.awt.* imports from sketches