Mark off _data idea in TODO