[WIP] More reasonable TODO