Resharpered some of the code, and added IDrafter.