First step to full annotation based solution.
Got base case work again.
Update test Groovy script.
Add GORM call back in.