[Contracts] More Contracts...

- Learning that adding code and ensuring all the contracts can be a ton of work.