Modified to start from existing structures.in files. Only working up through enumerator.