Added series of todos.

Added Todos