Feature 4 collections

merging current work