Update config with regards to grouping (still not working) and add notes about lessons learned
Update TODO