Revert "This is junk"

This reverts commit b60e30a0667d76f9e1e480809ab922ec03107382.

Conflicts:
	S&S.txt