wip: start refactor for backbone.