added TODOs
(proposed by Designburo)