I did this originally on 2.5.2, should still be the same w/ 3.1.2, but let me verify. I could also have some logic problems as I really didn't run this code a whole lot.
