Commit before refactor
mess