Updated lots of files, things still don't work perfectly.
Updated Tests to see if that helps. They appear to test things that aren't used anywhere else...