Added comments and todos.