Need to add some spring, plus ITESTs etc