Remove half-assed caching
Add Backbone
First pass at a refactor