Remove TODO comments above. (You've implemented it! Yay!)