Fixed the core issues.
Now just have one error around List equality to fix and we're done.