Began backbone refactor