Fleshes out classes and enums