Add some classes; Benchmark stuff