More work sorting out the class hierarchy and re-imaging the list library.