moves some TODOs around