Heavy WIP, refactoring to backbone