Started work on adding collections
Updated version