like my comment style? :P  We should clean these up before merging.