Sprinkled TODOs around the code