more wip perf work. need to test on better hardware