starting v2 rewrites

Ignore-this: 68515d5346eda58299d9162c45697348

darcs-hash:20130630102353-312f9-1df18c57cadda8d141e08b1f9f97a39123b805e5