Contract Changes

Made changes from contracts. Will need to redo since we changed
contracts again