Makes the enums work.  <?> yay (and a bit of invoke)
Removes unused imports