Imported Deanna, Jonathan R, and Michael's stuff

via packages