more todo notes for renaming & grouping methods