destructive patching wip
more of massive refactoring