56% through this rewrite