Commit 35. (Beta Candidate)
Removed some TODO comments.