Implement benchmarking
Improve the benchmark stuff