Looks like it's now working. I haven't cleaned up the code at all though, so there could still be a lot of left over stuff from when we were loading from one file.
Fixed some bugs
Fixed more bugs!
Fixed another bug.