Started major Weaver refactoring.