Started refactoring benchmarking library more sanely