need to take a good hard look at the addClass() methods...