Official contracts ++ code review

Last updated