moved things over to groovy