New Ember Heirloom fashion

Update to my main Ember, with an old reference on the side (I'll need to redo it now)