add buttons
merge davids ember-model
dd
ss
ss
merge
working map