Fixed up Mechanic stuff to come from parsed data rather than the superslow enum