Doc — Added some todos