adding todo comments back