Added TODO comments to keep the course of development in eye sight.