Last commit before refactoring
unfinished refactorings work