Revert "Arghh!"

This reverts commit 50d5cebd84ab7e48a1567c0e537cc91d55499bde.
Revert "Going to punch someone!"

This reverts commit 73e26ce482e7453d9c135e8c91d56faa3672576f.
Revert "???"

This reverts commit 457f28fd1f02cea9e7ce61af22d0353f34d6f8cb.
Revert "Trying desperately to force rebuild"

This reverts commit 2c55f462843a2a6a5f054e51d5b9a2de1824ffeb.
Revert and adding some rough draft
Tidy up
More stuff