Did some TODOs.