Small modifications to get it ACTUALLY running, including groovy