Fully updated. For real this time.

Everything is fully updated. Tests have all been added and checked.
Removed unused classes and some unused enums and functions. Jesus.