Refactored collections to take logic out of #intialize and put it into separate, unit tested, functions. Some small changes to model-application and router to work with updates.