Revert "Far simpler version"

This reverts commit 06eb48a8061cbd625e07d9d45f44e04cf998da5e.

Conflicts:
	README.md