Slowly converting to using ember data