Work on getting stuff to not collide horribly. Viruses bump when spanning programs.
Merge commit 'b51a4dd717e0ff332bd89da2b5c6985dd72356ae'