Move todo to better location