Why have the TODOs been removed here? Are they implemented elsewhere?