WIP make it a tiny bit faster, maybe...