more backbone refactoring