Refactors
Adds to and refactors collections