Edward - 2012-06-01

This should be pretty easy, I'll defer it to 2.0 for now but I may take a look earlier than that.

  • milestone: 1.0 --> 2.0