Relocated TODO for steps into an issue