move code around
refactor group function, still needs more work
when renamed fills tests failed, updated expected files