Now code is freaking out on self.viruses

But I fixed other stuff. I know these are terrible commit messages...