Code review. Add few todo's