Switch to enums and finished archive set up.