add more TODO (re: colors)