Begining of mapping refactoring, satisfying
Refactoring in progress"