added function body for group declartions, updated TODOs