Fixes, moving to backbone