now it's buildable, but not tested...
After I'm testing this two commits will revert and I will make new clean commit, what working good