i would not touch this too much until #62 is merged, or you run into conflicts. joel is cleaning things up over there.