Tests ok; ready for model