Some TODOS added.