Clouch Potatoes Pull Request

Pull Request for Andy Garron, Mohit Iyyer, Peter Enns, Fan Du