More output for benchmark
Test logger
Put things back together
Move interfaces