Cory's stuff

Don't merge...because the change set looks very strange...