Cleanup
Begin Backbone overhaul [BROKEN]