[PATCH] add todo comments