Finished all enums. Pre-cleanup