Adding a handful of comments and todos.