Martin, FYI, I dropped your last commit and made a lot of smaller ones instead. So far all rake tasks looks good.