Adding more collections code. INCOMPLETE