Now seems to work and runs benchmarks