Update to include all the Enum basic implementation and some tests...