Adding in all new code for benchmarks