modify & fix models
experiment with Ember