Another set of API adjustments.  It's good to actually try using your own APIs :)