Basic modifications for Ember

See commits for the changes. Let me know if you want it squashed.