WIP - make this more bunyan friendly