Removed all backbone stuff and re-did in angular