Large Enumerator-related refactoring#8

Theadd wants to merge 3 commits intomainTheadd/ArrayList:mainfrom

dev-enumeratorTheadd/ArrayList:dev-enumeratorCopy head branch name to clipboard