diff --git a/TODO b/TODO
index e69de29..2bcfb14 100644
--- a/TODO
+++ b/TODO
@@ -0,0 +1,16 @@
+Before Next Release:
+
+* Add state actions (enter, exit, after)
+* Add automatic persistence hooks for ActiveRecord classes
+* Add #aasm_next_state_for_event
+* Add #aasm_next_states_for_event
+* Add .states
+
+
+Cool ideas from users:
+
+* Support multiple state machines on one object (Chris Nelson)
+* http://justbarebones.blogspot.com/2007/11/actsasstatemachine-enhancements.html (Chetan Patil)
+* next_events_for_current_state (Nick Plante)
+* transition logging (Artem Vasiliev)
+* timestamp column for state change on AR (Mike Ferrier)