WIP, wrote up Enum, some tweaks to CSV