Again, y, this was mostly debug/benchmarking code and not intended for mainline... whoops