Clearer and better performing version, also more likely to actually work as expected :)

Note: still not implemented internals of agreement

The agreement stuff isn't implemented yet.