Please close


Please close this pull request, I'm moving COOK-3561, COOK-411, and COOK-3543 into their own branches and submitting separate pull requests for each.