#52 - TODO for the Groovy rewrite