Brainweaver: halfway refactoring Edge