All tests working
Enum support.
Optimized imports/reformatted code.