Moved stuff around, added support for string parse conversion, and string to enum