Adding in previous changes (this repo maybe on it's way to deprecation (might move to backbone marionette or polymer)).