tentative first draft for sorting. also need to test new regex
Merge branch 'test'