collection

Moved initial call to a collection and fixed a few collection bugs