This is a great, but big change - should get the other libs republished at some pt, too.