More Backbone work and refactoring