First steps to #742 task