Another commit... at least we've fixed the checking and adding
functions. Next, we have to make sure we're adding the right things to
the right things.