TODO comments for issue #3