Composite lists

READY FOR MERGING