Updated for groovy

I saw the issue listed, and thought I'd do some of it.