Rewrites Part 2:
Changing over some Public Const to Public Enums.