started hacking on collections support