+ just cleans up issues, and disables one test that can't be fixed. + biggest change is encoders not using multiple imports now.
* Merging file drop * Fixing double drop