Change To Preconditions

I'll squash these when all has been decided and all problems ironed out.