This needs to be sorted to work correctly...  The last major bug is that
the CC numbers in the dict are completely wrong, but otherwise everything
seems to be working well...