WIP shuffle
WIP remove unused ini section
WIP shuffle & light refactoring