Backbone refactor mostly working