WIP envelope

Signed-off-by: Stephan Hagemann <stephan@pivotallabs.com>