Added some todos, etc.