WIP-2

Signed-off-by: Eric Malm <emalm@pivotal.io>