Added comments and a TODO.