I'm thinking that as long as I'm touching this code anyway it might be worthwhile to see about adding more features that were originally planned to be on hold until 2.0.