New collection lib is a bit of a mess, but shaped in.