Updating with patricks stuff

Updating with patricks stuff