More code ported to ember-cli