[*] Large chunk, massive refactoring