wip2

Signed-off-by: Joseph Palermo <jpalermo@pivotallabs.com>