[#37] First working stage of the feature