Issue ITTE-529

All three tasks of the collections issue.