Added TODOs, groups files