Adding new stuff and Groovy cleanup