Basic work carried out - still very java for a groovy project!