Added raw logic without using Backbone yet