New Backbone based client
Merge in new backbone client