Much faster, just needs a spit & polish now