Adding TODO's for Goldie. Removed @author tags.