Updated TODO for the bigger steps [ci skip]