Consolidated Backbone models

Now only have one model instead of two.