Some TODOs and comment