Heavy refactoring in process\!