New project. Need powerful refactoring.