WIP: Emphemeral support

Good catch!