Cleaning up. WIP: Naomi should be using the new collection object.