Added contracts, will test more tomorrow morning