Some work on the list wrapper