Big TwitterSA, classification update

Because I'm bad at remembering to commit, and it's late.