updated to jsonp to match angular model
updated states as objects over string-based