More advanced logging

Signed-off-by: Zachary Auerbach <zauerbach@pivotal.io>