remove ember-data, add error state
refactor some more