That Fucking Refactor: spade + block mostly shifted into their own things, still some ties to cut though