Refactored collection as model (rather than actual Backbone collection).  Still updating tests